From 645e5d464ed1c40d3b0e2a6cce621ac9d9be7254 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 11 Oct 2019 15:29:53 +0800 Subject: [PATCH 01/96] Move all projects to generic host & remove IConfigurationAccessor usage. Resolve #1888 --- .../Volo.Abp.AspNetCore.TestBase.csproj | 1 + .../AbpAspNetCoreIntegratedTestBase.cs | 33 ++++++++------ ...reMultiTenancy_WithDomainResolver_Tests.cs | 5 ++- ...ltiTenancy_Without_DomainResolver_Tests.cs | 5 ++- .../AspNetCore/Mvc/AspNetCoreMvcTestBase.cs | 5 ++- .../Mvc/Json/JsonResultController_Tests.cs | 3 +- .../Mvc/Json/JsonSerializer_Tests.cs | 3 +- .../Volo/Abp/AspNetCore/Mvc/Startup.cs | 9 +--- ...AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs | 5 ++- .../Mvc/UI/Bootstrap/Demo/TestStartup.cs | 9 +--- .../Program.cs | 22 ++++------ .../Startup.cs | 7 +-- ...bp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj | 2 +- .../Volo/Abp/AspNetCore/Mvc/UI/Startup.cs | 10 +---- .../Abp/AspNetCore/Mvc/Versioning/Startup.cs | 10 +---- .../Volo/Abp/AspNetCore/Startup.cs | 9 +--- .../Volo/Abp/Http/Startup.cs | 10 +---- .../app/Volo.BloggingTestApp/Program.cs | 20 ++++----- .../app/Volo.BloggingTestApp/Startup.cs | 12 ++--- .../Volo.BloggingTestApp.csproj | 2 +- .../Volo.ClientSimulation.Demo/Program.cs | 20 ++++----- .../Volo.ClientSimulation.Demo/Startup.cs | 9 +--- .../Volo.ClientSimulation.Demo.csproj | 2 +- .../Branding/VoloDocsBrandingProvider.cs | 7 ++- modules/docs/app/VoloDocs.Web/Program.cs | 20 ++++----- modules/docs/app/VoloDocs.Web/Startup.cs | 11 ++--- .../docs/app/VoloDocs.Web/VoloDocs.Web.csproj | 2 +- .../BasicAspNetCoreApplication.csproj | 4 +- .../BasicAspNetCoreApplication/Program.cs | 14 +++--- .../BasicAspNetCoreApplication/Startup.cs | 9 +--- .../IdentityServerDataSeedContributor.cs | 9 ++-- .../Acme.BookStore.HttpApi.Host.csproj | 4 +- .../Acme.BookStore.HttpApi.Host/Program.cs | 20 ++++----- .../Acme.BookStore.HttpApi.Host/Startup.cs | 9 +--- ...cme.BookStore.Application.Contracts.csproj | 10 ++--- .../Acme.BookStore.Application.csproj | 10 ++--- .../Acme.BookStore.DbMigrator.csproj | 2 +- .../Acme.BookStore.Domain.csproj | 18 ++++---- .../IdentityServerDataSeedContributor.cs | 9 ++-- .../Acme.BookStore.HttpApi.Client.csproj | 10 ++--- .../Acme.BookStore.HttpApi.csproj | 10 ++--- .../Acme.BookStore.Web.csproj | 18 ++++---- .../src/Acme.BookStore.Web/Program.cs | 20 ++++----- .../src/Acme.BookStore.Web/Startup.cs | 9 +--- ...Store.HttpApi.Client.ConsoleTestApp.csproj | 2 +- .../Acme.BookStore.TestBase.csproj | 6 +-- .../Acme.BookStore.Web.Tests.csproj | 2 +- .../BookStoreWebTestBase.cs | 5 ++- .../BookStoreWebTestStartup.cs | 9 +--- ...okStore.BookManagement.HttpApi.Host.csproj | 16 +++---- .../Program.cs | 20 ++++----- .../Startup.cs | 11 ++--- ...Store.BookManagement.IdentityServer.csproj | 44 +++++++++---------- .../IdentityServerDataSeedContributor.cs | 9 ++-- .../Program.cs | 20 ++++----- .../Startup.cs | 11 ++--- ...e.BookStore.BookManagement.Web.Host.csproj | 24 +++++----- .../Program.cs | 20 ++++----- .../Startup.cs | 9 +--- ...ookStore.BookManagement.Web.Unified.csproj | 34 +++++++------- .../Program.cs | 20 ++++----- .../Startup.cs | 11 ++--- ...ookManagement.Application.Contracts.csproj | 4 +- ...ookStore.BookManagement.Application.csproj | 4 +- ...kStore.BookManagement.Domain.Shared.csproj | 4 +- ...cme.BookStore.BookManagement.Domain.csproj | 4 +- ....BookManagement.EntityFrameworkCore.csproj | 4 +- ...Store.BookManagement.HttpApi.Client.csproj | 4 +- ...me.BookStore.BookManagement.HttpApi.csproj | 4 +- ...me.BookStore.BookManagement.MongoDB.csproj | 4 +- .../Acme.BookStore.BookManagement.Web.csproj | 6 +-- ...ement.HttpApi.Client.ConsoleTestApp.csproj | 4 +- .../ClientDemoService.cs | 37 ++++++++-------- ...cme.BookStore.Application.Contracts.csproj | 9 ++-- .../Acme.BookStore.Application.csproj | 9 ++-- .../Acme.BookStore.DbMigrator.csproj | 2 +- .../Acme.BookStore.Domain.Shared.csproj | 16 +++---- .../Acme.BookStore.Domain.csproj | 18 ++++---- .../IdentityServerDataSeedContributor.cs | 9 ++-- .../Acme.BookStore.EntityFrameworkCore.csproj | 18 ++++---- .../Acme.BookStore.HttpApi.Client.csproj | 9 ++-- .../Acme.BookStore.HttpApi.csproj | 9 ++-- .../Acme.BookStore.Web.csproj | 16 +++---- .../src/Acme.BookStore.Web/Program.cs | 20 ++++----- .../src/Acme.BookStore.Web/Startup.cs | 9 +--- ...Store.HttpApi.Client.ConsoleTestApp.csproj | 2 +- .../Acme.BookStore.TestBase.csproj | 6 +-- .../Acme.BookStore.Web.Tests.csproj | 2 +- .../BookStoreWebTestBase.cs | 5 ++- .../BookStoreWebTestStartup.cs | 9 +--- .../IdentityServerDataSeedContributor.cs | 9 ++-- .../DashboardDemo.Web.csproj | 2 +- .../src/DashboardDemo.Web/Program.cs | 21 ++++----- .../src/DashboardDemo.Web/Startup.cs | 9 +--- .../DashboardDemoWebTestBase.cs | 5 ++- .../DashboardDemoWebTestStartup.cs | 9 +--- .../AuthServer.Host/AuthServer.Host.csproj | 2 +- .../applications/AuthServer.Host/Program.cs | 21 ++++----- .../applications/AuthServer.Host/Startup.cs | 11 ++--- .../BackendAdminApp.Host.csproj | 2 +- .../BackendAdminApp.Host/Program.cs | 20 ++++----- .../BackendAdminApp.Host/Startup.cs | 11 ++--- .../PublicWebSite.Host/Program.cs | 20 ++++----- .../PublicWebSite.Host.csproj | 2 +- .../PublicWebSite.Host/Startup.cs | 11 ++--- .../BackendAdminAppGateway.Host.csproj | 2 +- .../BackendAdminAppGateway.Host/Program.cs | 20 ++++----- .../BackendAdminAppGateway.Host/Startup.cs | 12 ++--- .../InternalGateway.Host.csproj | 2 +- .../gateways/InternalGateway.Host/Program.cs | 20 ++++----- .../gateways/InternalGateway.Host/Startup.cs | 12 ++--- .../PublicWebSiteGateway.Host/Program.cs | 20 ++++----- .../PublicWebSiteGateway.Host.csproj | 2 +- .../PublicWebSiteGateway.Host/Startup.cs | 12 ++--- .../BloggingService.Host.csproj | 2 +- .../BloggingService.Host/Program.cs | 20 ++++----- .../BloggingService.Host/Startup.cs | 12 ++--- .../IdentityService.Host.csproj | 2 +- .../IdentityService.Host/Program.cs | 20 ++++----- .../IdentityService.Host/Startup.cs | 12 ++--- .../ProductService.Host.csproj | 2 +- .../ProductService.Host/Program.cs | 20 ++++----- .../ProductService.Host/Startup.cs | 12 ++--- .../IdentityServerDataSeedContributor.cs | 9 ++-- .../MyProjectNameWebTestBase.cs | 5 ++- .../MyProjectNameWebTestStartup.cs | 9 +--- .../Startup.cs | 2 +- .../IdentityServerDataSeedContributor.cs | 11 ++--- .../Startup.cs | 2 +- .../Startup.cs | 2 +- .../ClientDemoService.cs | 37 ++++++++-------- 131 files changed, 627 insertions(+), 767 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj index 7ec3846531..a468d4cfd6 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj +++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj @@ -19,6 +19,7 @@ + diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs index ae238f3694..d1881b0cbd 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs +++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs @@ -3,9 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.TestBase { @@ -20,31 +22,36 @@ namespace Volo.Abp.AspNetCore.TestBase protected AbpAspNetCoreIntegratedTestBase() { - var builder = CreateWebHostBuilder(); - Server = CreateTestServer(builder); - Client = Server.CreateClient(); - ServiceProvider = Server.Host.Services; + var builder = CreateHostBuilder(); + + var host = builder.Build(); + host.Start(); + + Server = host.GetTestServer(); + Client = host.GetTestClient(); + + ServiceProvider = Server.Services; ServiceProvider.GetRequiredService().Server = Server; } - protected virtual IWebHostBuilder CreateWebHostBuilder() + protected virtual IHostBuilder CreateHostBuilder() { - return new WebHostBuilder() - .UseStartup() + return Host.CreateDefaultBuilder() + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + webBuilder.UseTestServer(); + }) + .UseAutofac() .ConfigureServices(ConfigureServices); } - protected virtual void ConfigureServices(WebHostBuilderContext context, IServiceCollection services) + protected virtual void ConfigureServices(HostBuilderContext context, IServiceCollection services) { } - protected virtual TestServer CreateTestServer(IWebHostBuilder builder) - { - return new TestServer(builder); - } - #region GetUrl /// diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs index c107444ba1..8b63f85853 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Shouldly; using Volo.Abp.MultiTenancy; @@ -23,9 +24,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy _options = ServiceProvider.GetRequiredService>().Value; } - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { - return base.CreateWebHostBuilder().ConfigureServices(services => + return base.CreateHostBuilder().ConfigureServices(services => { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs index 98a7e92ef1..70f730d4b3 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Microsoft.Net.Http.Headers; using Shouldly; @@ -24,9 +25,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy _options = ServiceProvider.GetRequiredService>().Value; } - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { - return base.CreateWebHostBuilder().ConfigureServices(services => + return base.CreateHostBuilder().ConfigureServices(services => { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs index cde2871e1b..e3bfa36ae6 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs @@ -1,12 +1,13 @@ using System.IO; using System.Linq; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.Mvc { public abstract class AspNetCoreMvcTestBase : AbpAspNetCoreTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { var contentRootPath = CalculateContentRootPath( "Volo.Abp.AspNetCore.Mvc.Tests.csproj", @@ -16,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc ) ); - return base.CreateWebHostBuilder() + return base.CreateHostBuilder() .UseContentRoot(contentRootPath); } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs index 508ac04ce2..3e365cde3e 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonResultController_Tests.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Shouldly; using Volo.Abp.Json; using Xunit; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json { public class JsonResultController_Tests : AspNetCoreMvcTestBase { - protected override void ConfigureServices(WebHostBuilderContext context, IServiceCollection services) + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs index f621a8733a..d911850919 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Json/JsonSerializer_Tests.cs @@ -1,6 +1,7 @@ using System; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Shouldly; using Volo.Abp.Json; using Xunit; @@ -16,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Json _jsonSerializer = ServiceProvider.GetRequiredService(); } - protected override void ConfigureServices(WebHostBuilderContext context, IServiceCollection services) + protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services) { services.Configure(options => { diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs index 9ae46be82f..b7079c7686 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs @@ -8,14 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs index 9ced6317ec..15473df986 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/AbpAspNetCoreMvcUiBootstrapDemoTestBase.cs @@ -2,14 +2,15 @@ using System.IO; using System.Linq; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public abstract class AbpAspNetCoreMvcUiBootstrapDemoTestBase : AbpAspNetCoreTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { - return base.CreateWebHostBuilder() + return base.CreateHostBuilder() .UseContentRoot(CalculateContentRootPath()); } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs index 3a140e35d4..3e39ba0f36 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo/Abp/AspNetCore/Mvc/UI/Bootstrap/Demo/TestStartup.cs @@ -8,14 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public class TestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs index 0941475418..fd9b64308f 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Program.cs @@ -21,7 +21,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Build().Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -35,20 +35,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo } } - //internal static IWebHost BuildWebHostInternal(string[] args) => - // new WebHostBuilder() - // .UseKestrel() - // .UseContentRoot(Directory.GetCurrentDirectory()) - // .UseIISIntegration() - // .UseStartup() - // .UseSerilog() - // .Build(); - internal static IHostBuilder BuildWebHostInternal(string[] args) => + internal static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs index 0497fe5216..086c20c365 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Startup.cs @@ -9,12 +9,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo { public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj index 455708a1d2..f798e90627 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj @@ -9,7 +9,7 @@ - + diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs index 124a103da2..8cc84075a4 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/Startup.cs @@ -8,15 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs index 79985de769..5092f91a81 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/Startup.cs @@ -8,15 +8,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs index 7f95713274..de4f55dc47 100644 --- a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs +++ b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/Startup.cs @@ -8,14 +8,9 @@ namespace Volo.Abp.AspNetCore { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs index 4704128d9d..c9ac8ba611 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/Startup.cs @@ -6,15 +6,9 @@ namespace Volo.Abp.Http { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - //TODO: This is needed because ASP.NET Core does not use IServiceProviderFactory! - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/modules/blogging/app/Volo.BloggingTestApp/Program.cs b/modules/blogging/app/Volo.BloggingTestApp/Program.cs index b184a68b4e..739850817f 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Program.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace Volo.BloggingTestApp try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace Volo.BloggingTestApp } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/Startup.cs b/modules/blogging/app/Volo.BloggingTestApp/Startup.cs index e4ccc31b60..fc53298f38 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Startup.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/Startup.cs @@ -9,19 +9,13 @@ namespace Volo.BloggingTestApp { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { - app.InitializeApplication(); } } diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index a0712e66f1..82bc4ff372 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -12,7 +12,7 @@ - + diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs index 86dc8569c7..6478e0cced 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace Volo.ClientSimulation.Demo try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace Volo.ClientSimulation.Demo } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs index 5b1f1debce..eb82e10e43 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs @@ -7,14 +7,9 @@ namespace Volo.ClientSimulation.Demo { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj index 6cfdef4205..9b681aeaa3 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs b/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs index c4fd5ecb66..8ae314ab05 100644 --- a/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs +++ b/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Localization; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; @@ -9,10 +10,8 @@ namespace VoloDocs.Web.Branding [Dependency(ReplaceServices = true)] public class VoloDocsBrandingProvider : DefaultBrandingProvider { - public VoloDocsBrandingProvider(IConfigurationAccessor configurationAccessor, IStringLocalizer localizer) + public VoloDocsBrandingProvider(IConfiguration configuration, IStringLocalizer localizer) { - var configuration = configurationAccessor.Configuration; - AppName = localizer["DocsTitle"]; if (configuration["LogoUrl"] != null) diff --git a/modules/docs/app/VoloDocs.Web/Program.cs b/modules/docs/app/VoloDocs.Web/Program.cs index 26959f112f..b40fa6b4f7 100644 --- a/modules/docs/app/VoloDocs.Web/Program.cs +++ b/modules/docs/app/VoloDocs.Web/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace VoloDocs.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace VoloDocs.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/modules/docs/app/VoloDocs.Web/Startup.cs b/modules/docs/app/VoloDocs.Web/Startup.cs index a05cf9e2c0..22d7b980c5 100644 --- a/modules/docs/app/VoloDocs.Web/Startup.cs +++ b/modules/docs/app/VoloDocs.Web/Startup.cs @@ -9,17 +9,12 @@ namespace VoloDocs.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index f7b0567f4c..a041d78e1a 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -14,7 +14,7 @@ - + diff --git a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj index 95fd323708..c6017e498b 100644 --- a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj +++ b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/BasicAspNetCoreApplication.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs index fe3e5c1bf9..6bde2c5812 100644 --- a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs +++ b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; namespace BasicAspNetCoreApplication { @@ -7,12 +8,15 @@ namespace BasicAspNetCoreApplication { public static void Main(string[] args) { - BuildWebHost(args).Run(); + CreateHostBuilder(args).Build().Run(); } - public static IWebHost BuildWebHost(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac(); } } diff --git a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs index fcf3161267..0b5dff5449 100644 --- a/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs +++ b/samples/BasicAspNetCoreApplication/BasicAspNetCoreApplication/Startup.cs @@ -7,14 +7,9 @@ namespace BasicAspNetCoreApplication { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app) diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 3458a965ac..e3b4ce770e 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace Acme.BookStore.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace Acme.BookStore.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace Acme.BookStore.IdentityServer "BookStore" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookStore_Web:ClientId"]; diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj index 60caedd837..d4edadc61a 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs index 5d04ef8371..5cc5d48721 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore try { Log.Information("Starting Acme.BookStore.HttpApi.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs index e93e05fa0d..af5a330272 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Startup.cs @@ -9,14 +9,9 @@ namespace Acme.BookStore { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj index 67f470cb4f..190f9a7d1a 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj @@ -12,11 +12,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj index 2b6b7d6767..5e21476d33 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj index 8617e64521..29f8d542a2 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj @@ -26,7 +26,7 @@ - + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj index d3f6b670fd..d3b63d7393 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 3458a965ac..e3b4ce770e 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace Acme.BookStore.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace Acme.BookStore.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace Acme.BookStore.IdentityServer "BookStore" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookStore_Web:ClientId"]; diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj index 44135e6782..9d501a9855 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj index d1bfba752f..d31eddc92d 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj @@ -13,11 +13,11 @@ - - - - - + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 6ecfde3589..e6eaf01e82 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ - + @@ -45,13 +45,13 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs index f7845a5726..f528641ac4 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs index 13db155180..06130a1d25 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Startup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj index c53dd5953f..3413d5e52c 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj index 15383e87c0..9796562462 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj index 1da47d7609..d018c3fee9 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs index 2e93483e70..446c1ef2dc 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace Acme.BookStore { public abstract class BookStoreWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs index 6e5452bde2..5e8c314a95 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore { public class BookStoreWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj index 77d59c25ce..4b457b1b03 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -10,18 +10,18 @@ - + - - - - - - + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs index ca8ff952ca..9b1ee3c9ab 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs index 1c70f94c38..7997f56d32 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Startup.cs @@ -9,17 +9,12 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj index f4fe52af5d..e216e9c938 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.0 @@ -8,33 +8,33 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 9ea7ae1435..73bd75a826 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -21,7 +22,7 @@ namespace Acme.BookStore.BookManagement.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -29,14 +30,14 @@ namespace Acme.BookStore.BookManagement.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -103,7 +104,7 @@ namespace Acme.BookStore.BookManagement.IdentityServer "BookManagement" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookManagement_Web:ClientId"]; diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs index ca8ff952ca..9b1ee3c9ab 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs index 1f1e1a5beb..8a81aa4d3c 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Startup.cs @@ -9,17 +9,12 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj index 3966fbf009..105dfc89db 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj @@ -1,4 +1,4 @@ - + @@ -10,22 +10,22 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs index ca8ff952ca..9b1ee3c9ab 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs index 9f7b1944ce..3af47039d6 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Startup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj index 133f92e897..2045d72aeb 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj @@ -1,4 +1,4 @@ - + @@ -10,25 +10,25 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs index b59c3d6fd8..58f024875b 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -20,7 +21,7 @@ namespace Acme.BookStore.BookManagement try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -34,14 +35,13 @@ namespace Acme.BookStore.BookManagement } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs index 699e10861a..bfc65cdb03 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Startup.cs @@ -9,17 +9,12 @@ namespace Acme.BookStore.BookManagement { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj index 1202c0c631..4c1d84fa66 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/Acme.BookStore.BookManagement.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj index f729fcd185..45097c877b 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application/Acme.BookStore.BookManagement.Application.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj index c189f99eb0..377f6df9b3 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/Acme.BookStore.BookManagement.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj index ff1dedce3f..05176a1c2a 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain/Acme.BookStore.BookManagement.Domain.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj index 79fbb46c07..5d0a8647fe 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/Acme.BookStore.BookManagement.EntityFrameworkCore.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj index 01419cdf03..85fca348ed 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi.Client/Acme.BookStore.BookManagement.HttpApi.Client.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj index 52c4dfd35d..bd8500a89d 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.HttpApi/Acme.BookStore.BookManagement.HttpApi.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj index db8af62817..0a1123f59c 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/Acme.BookStore.BookManagement.MongoDB.csproj @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj index da42d3d6e6..bbd69db06d 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/Acme.BookStore.BookManagement.Web.csproj @@ -1,4 +1,4 @@ - + @@ -11,8 +11,8 @@ - - + + diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj index e656bb7639..a8d6b266fb 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,7 +7,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index 4cda56da1e..c931f18716 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using IdentityModel.Client; using Acme.BookStore.BookManagement.Books; using Acme.BookStore.BookManagement.Samples; +using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; @@ -15,18 +16,18 @@ namespace Acme.BookStore.BookManagement { private readonly ISampleAppService _sampleAppService; private readonly IIdentityModelAuthenticationService _authenticationService; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; private readonly IBookAppService _bookAppService; public ClientDemoService( ISampleAppService sampleAppService, IIdentityModelAuthenticationService authenticationService, - IConfigurationAccessor configurationAccessor, + IConfiguration configuration, IBookAppService bookAppService) { _sampleAppService = sampleAppService; _authenticationService = authenticationService; - _configurationAccessor = configurationAccessor; + _configuration = configuration; _bookAppService = bookAppService; } @@ -71,13 +72,13 @@ namespace Acme.BookStore.BookManagement var accessToken = await _authenticationService.GetAccessTokenAsync( new IdentityClientConfiguration( - _configurationAccessor.Configuration["IdentityClients:Default:Authority"], - _configurationAccessor.Configuration["IdentityClients:Default:Scope"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - _configurationAccessor.Configuration["IdentityClients:Default:GrantType"], - _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"] + _configuration["IdentityClients:Default:Authority"], + _configuration["IdentityClients:Default:Scope"], + _configuration["IdentityClients:Default:ClientId"], + _configuration["IdentityClients:Default:ClientSecret"], + _configuration["IdentityClients:Default:GrantType"], + _configuration["IdentityClients:Default:UserName"], + _configuration["IdentityClients:Default:UserPassword"] ) ); @@ -87,7 +88,7 @@ namespace Acme.BookStore.BookManagement { httpClient.SetBearerToken(accessToken); - var url = _configurationAccessor.Configuration["RemoteServices:BookManagement:BaseUrl"] + + var url = _configuration["RemoteServices:BookManagement:BaseUrl"] + "api/BookManagement/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); @@ -116,7 +117,7 @@ namespace Acme.BookStore.BookManagement // discover endpoints from metadata var client = new HttpClient(); - var disco = await client.GetDiscoveryDocumentAsync(_configurationAccessor.Configuration["IdentityClients:Default:Authority"]); + var disco = await client.GetDiscoveryDocumentAsync(_configuration["IdentityClients:Default:Authority"]); if (disco.IsError) { Console.WriteLine(disco.Error); @@ -127,11 +128,11 @@ namespace Acme.BookStore.BookManagement var tokenResponse = await client.RequestPasswordTokenAsync(new PasswordTokenRequest { Address = disco.TokenEndpoint, - ClientId = _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - ClientSecret = _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - UserName = _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - Password = _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"], - Scope = _configurationAccessor.Configuration["IdentityClients:Default:Scope"] + ClientId = _configuration["IdentityClients:Default:ClientId"], + ClientSecret = _configuration["IdentityClients:Default:ClientSecret"], + UserName = _configuration["IdentityClients:Default:UserName"], + Password = _configuration["IdentityClients:Default:UserPassword"], + Scope = _configuration["IdentityClients:Default:Scope"] }); if (tokenResponse.IsError) @@ -148,7 +149,7 @@ namespace Acme.BookStore.BookManagement { httpClient.SetBearerToken(tokenResponse.AccessToken); - var url = _configurationAccessor.Configuration["RemoteServices:BookManagement:BaseUrl"] + + var url = _configuration["RemoteServices:BookManagement:BaseUrl"] + "api/BookManagement/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); diff --git a/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj b/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj index 6330e87867..ba56e3b6b0 100644 --- a/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj +++ b/samples/BookStore/src/Acme.BookStore.Application.Contracts/Acme.BookStore.Application.Contracts.csproj @@ -12,10 +12,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj b/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj index 7ed9e72b19..3811eb7cfb 100644 --- a/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj +++ b/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj @@ -13,10 +13,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj b/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj index 7a2aa7a7f3..9a341e86bd 100644 --- a/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj +++ b/samples/BookStore/src/Acme.BookStore.DbMigrator/Acme.BookStore.DbMigrator.csproj @@ -29,7 +29,7 @@ - + diff --git a/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj b/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj index 5ffec7bf7d..d9a183a46f 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj +++ b/samples/BookStore/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj @@ -8,14 +8,14 @@ - - - - - - - - + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj b/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj index 0ab6ca3f72..3e09243254 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj +++ b/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj @@ -13,15 +13,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 45c2420501..77a77ba398 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -21,7 +22,7 @@ namespace Acme.BookStore.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -29,14 +30,14 @@ namespace Acme.BookStore.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -103,7 +104,7 @@ namespace Acme.BookStore.IdentityServer "BookStore" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["BookStore_Web:ClientId"]; diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj index 5066a6854f..5e7a422b35 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj b/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj index 4a72b8b8bb..3e837e1aeb 100644 --- a/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj +++ b/samples/BookStore/src/Acme.BookStore.HttpApi.Client/Acme.BookStore.HttpApi.Client.csproj @@ -12,10 +12,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj b/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj index ce416b23f7..27e8664735 100644 --- a/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj +++ b/samples/BookStore/src/Acme.BookStore.HttpApi/Acme.BookStore.HttpApi.csproj @@ -12,10 +12,11 @@ - - - - + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 5dab7d1cfe..74b19458ed 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -23,7 +23,7 @@ - + @@ -36,13 +36,13 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Web/Program.cs b/samples/BookStore/src/Acme.BookStore.Web/Program.cs index 6eadd00f78..0d888f989c 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Program.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/Program.cs @@ -1,6 +1,7 @@ using System; using System.IO; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +25,7 @@ namespace Acme.BookStore.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +39,13 @@ namespace Acme.BookStore.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/BookStore/src/Acme.BookStore.Web/Startup.cs b/samples/BookStore/src/Acme.BookStore.Web/Startup.cs index 7cafe1a4c0..9dd0bdcaec 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Startup.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/Startup.cs @@ -9,14 +9,9 @@ namespace Acme.BookStore.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj index b1196024d8..4a329ed935 100644 --- a/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore/test/Acme.BookStore.HttpApi.Client.ConsoleTestApp/Acme.BookStore.HttpApi.Client.ConsoleTestApp.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj b/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj index ef1fdc1d69..39857b562b 100644 --- a/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj +++ b/samples/BookStore/test/Acme.BookStore.TestBase/Acme.BookStore.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj b/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj index 7be27ff1a0..6f47d7fa6a 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs index 2e93483e70..446c1ef2dc 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace Acme.BookStore { public abstract class BookStoreWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs index 6e5452bde2..5e8c314a95 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestStartup.cs @@ -8,14 +8,9 @@ namespace Acme.BookStore { public class BookStoreWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index c434777402..2cadd545db 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace DashboardDemo.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace DashboardDemo.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace DashboardDemo.IdentityServer "DashboardDemo" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["DashboardDemo_Web:ClientId"]; diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj index 56a3fa2209..36610ffdb3 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj @@ -31,7 +31,7 @@ - + diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs index 354ec3f60a..6d71693b20 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Program.cs @@ -1,6 +1,8 @@ using System; using System.IO; +using System.Linq; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; @@ -24,7 +26,7 @@ namespace DashboardDemo.Web try { Log.Information("Starting web host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -38,14 +40,13 @@ namespace DashboardDemo.Web } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs index 62c4705931..04b9dbd4bc 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Startup.cs @@ -8,14 +8,9 @@ namespace DashboardDemo.Web { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs index b81ae13794..2602485b00 100644 --- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs +++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace DashboardDemo { public abstract class DashboardDemoWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs index 1ab2b1d5d9..562a9a206f 100644 --- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs +++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestStartup.cs @@ -8,14 +8,9 @@ namespace DashboardDemo { public class DashboardDemoWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj index 0c6538bf57..40451442a0 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/AuthServer.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs index 34e6b74443..ab4c2ba330 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Program.cs @@ -1,7 +1,9 @@ using System; using System.IO; +using System.Linq; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +39,7 @@ namespace AuthServer.Host try { Log.Information("Starting AuthServer.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +53,13 @@ namespace AuthServer.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs index f9d963021c..0af0b32973 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Startup.cs @@ -9,17 +9,12 @@ namespace AuthServer.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj index 96ff8bb1dc..a82b7724de 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs index 2b1cfb9230..4b001972e4 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace BackendAdminApp.Host try { Log.Information("Starting BackendAdminApp.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace BackendAdminApp.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs index 15edcb704c..d394c50028 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/Startup.cs @@ -9,17 +9,12 @@ namespace BackendAdminApp.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs index fab8c9f2b3..75435b7a9f 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace PublicWebSite.Host try { Log.Information("Starting PublicWebSite.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace PublicWebSite.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj index 1475311f4b..b6871999f1 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSite.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs index 4195a62daa..6b4fd36063 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/Startup.cs @@ -9,17 +9,12 @@ namespace PublicWebSite.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj index cc8cd37351..e35318bdee 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs index 95ddd89b2c..4eeaab28f3 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace BackendAdminAppGateway.Host try { Log.Information("Starting BackendAdminAppGateway.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace BackendAdminAppGateway.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs index 4b41be9ad3..602ddc20be 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs @@ -9,18 +9,12 @@ namespace BackendAdminAppGateway.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj index ae9b1d5dd1..38e86ded7c 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs index 8cd13725ad..88432ac54d 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace InternalGateway.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace InternalGateway.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs index aed7ebbf4f..fb00700915 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs @@ -9,18 +9,12 @@ namespace InternalGateway.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs index 23d419b91d..f41a11e156 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace PublicWebSiteGateway.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace PublicWebSiteGateway.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj index f9bc566169..5b55baf619 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs index ab6a066e3e..df156b9755 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/Startup.cs @@ -9,18 +9,12 @@ namespace PublicWebSiteGateway.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj index 51f991da3f..c59551a3a6 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs index 61bcf82104..4a2f3d30c2 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace BloggingService.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace BloggingService.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs index c0510c52de..e3ad346cb7 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Startup.cs @@ -9,18 +9,12 @@ namespace BloggingService.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj index 684f1bd4f1..04fbe9f82a 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs index 44fb949f87..6b64284bc8 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace IdentityService.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace IdentityService.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs index f472affe55..f3a24f8a26 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Startup.cs @@ -9,18 +9,12 @@ namespace IdentityService.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj index 80d2a33bd6..8173d49fdb 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs index 3b9cfb6630..4f8998937e 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Program.cs @@ -2,6 +2,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Sinks.Elasticsearch; @@ -37,7 +38,7 @@ namespace ProductService.Host try { Log.Information("Starting IdentityService.Host."); - BuildWebHostInternal(args).Run(); + CreateHostBuilder(args).Build().Run(); return 0; } catch (Exception ex) @@ -51,14 +52,13 @@ namespace ProductService.Host } } - public static IWebHost BuildWebHostInternal(string[] args) => - new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIIS() - .UseIISIntegration() - .UseStartup() - .UseSerilog() - .Build(); + internal static IHostBuilder CreateHostBuilder(string[] args) => + Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }) + .UseAutofac() + .UseSerilog(); } } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs index 7734e291e6..9124b5e413 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Startup.cs @@ -9,18 +9,12 @@ namespace ProductService.Host { public class Startup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - options.Configuration.UserSecretsAssembly = typeof(Startup).Assembly; - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index b8ee88b061..e64ae510c5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using IdentityServer4.Models; +using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Configuration; using Volo.Abp.Data; @@ -24,7 +25,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -32,14 +33,14 @@ namespace MyCompanyName.MyProjectName.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -104,7 +105,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer "MyProjectName" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["MyProjectName_Web:ClientId"]; diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs index 9b194b2203..ec29900d07 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Shouldly; @@ -11,10 +12,10 @@ namespace MyCompanyName.MyProjectName { public abstract class MyProjectNameWebTestBase : AbpAspNetCoreIntegratedTestBase { - protected override IWebHostBuilder CreateWebHostBuilder() + protected override IHostBuilder CreateHostBuilder() { return base - .CreateWebHostBuilder() + .CreateHostBuilder() .UseContentRoot(WebContentDirectoryFinder.CalculateContentRootFolder()); } diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs index 846ccc5031..eefa272f9e 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestStartup.cs @@ -8,14 +8,9 @@ namespace MyCompanyName.MyProjectName { public class MyProjectNameWebTestStartup { - public IServiceProvider ConfigureServices(IServiceCollection services) + public void ConfigureServices(IServiceCollection services) { - services.AddApplication(options => - { - options.UseAutofac(); - }); - - return services.BuildServiceProviderFromFactory(); + services.AddApplication(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs index dc9807e4a0..51efdce5bc 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Startup.cs @@ -13,7 +13,7 @@ namespace MyCompanyName.MyProjectName services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 0c6a66bcb3..45c3c50340 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -1,4 +1,5 @@ -using System; +using Microsoft.Extensions.Configuration; +using System; using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Authorization.Permissions; @@ -21,7 +22,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer private readonly IIdentityResourceDataSeeder _identityResourceDataSeeder; private readonly IGuidGenerator _guidGenerator; private readonly IPermissionDataSeeder _permissionDataSeeder; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public IdentityServerDataSeedContributor( IClientRepository clientRepository, @@ -29,14 +30,14 @@ namespace MyCompanyName.MyProjectName.IdentityServer IIdentityResourceDataSeeder identityResourceDataSeeder, IGuidGenerator guidGenerator, IPermissionDataSeeder permissionDataSeeder, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _clientRepository = clientRepository; _apiResourceRepository = apiResourceRepository; _identityResourceDataSeeder = identityResourceDataSeeder; _guidGenerator = guidGenerator; _permissionDataSeeder = permissionDataSeeder; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } [UnitOfWork] @@ -103,7 +104,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer "MyProjectName" }; - var configurationSection = _configurationAccessor.Configuration.GetSection("IdentityServer:Clients"); + var configurationSection = _configuration.GetSection("IdentityServer:Clients"); //Web Client var webClientId = configurationSection["MyProjectName_Web:ClientId"]; diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs index 5efb1ca00d..df50584cb5 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Startup.cs @@ -13,7 +13,7 @@ namespace MyCompanyName.MyProjectName services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs index e052534eb7..e48fe56fbc 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/Startup.cs @@ -12,7 +12,7 @@ namespace MyCompanyName.MyProjectName services.AddApplication(); } - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory) { app.InitializeApplication(); } diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index cb4dbd347d..ac7f4fc7df 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -2,6 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; using IdentityModel.Client; +using Microsoft.Extensions.Configuration; using MyCompanyName.MyProjectName.Samples; using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; @@ -13,16 +14,16 @@ namespace MyCompanyName.MyProjectName { private readonly ISampleAppService _sampleAppService; private readonly IIdentityModelAuthenticationService _authenticationService; - private readonly IConfigurationAccessor _configurationAccessor; + private readonly IConfiguration _configuration; public ClientDemoService( ISampleAppService sampleAppService, IIdentityModelAuthenticationService authenticationService, - IConfigurationAccessor configurationAccessor) + IConfiguration configuration) { _sampleAppService = sampleAppService; _authenticationService = authenticationService; - _configurationAccessor = configurationAccessor; + _configuration = configuration; } public async Task RunAsync() @@ -60,13 +61,13 @@ namespace MyCompanyName.MyProjectName var accessToken = await _authenticationService.GetAccessTokenAsync( new IdentityClientConfiguration( - _configurationAccessor.Configuration["IdentityClients:Default:Authority"], - _configurationAccessor.Configuration["IdentityClients:Default:Scope"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - _configurationAccessor.Configuration["IdentityClients:Default:GrantType"], - _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"] + _configuration["IdentityClients:Default:Authority"], + _configuration["IdentityClients:Default:Scope"], + _configuration["IdentityClients:Default:ClientId"], + _configuration["IdentityClients:Default:ClientSecret"], + _configuration["IdentityClients:Default:GrantType"], + _configuration["IdentityClients:Default:UserName"], + _configuration["IdentityClients:Default:UserPassword"] ) ); @@ -76,7 +77,7 @@ namespace MyCompanyName.MyProjectName { httpClient.SetBearerToken(accessToken); - var url = _configurationAccessor.Configuration["RemoteServices:MyProjectName:BaseUrl"] + + var url = _configuration["RemoteServices:MyProjectName:BaseUrl"] + "api/MyProjectName/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); @@ -105,7 +106,7 @@ namespace MyCompanyName.MyProjectName // discover endpoints from metadata var client = new HttpClient(); - var disco = await client.GetDiscoveryDocumentAsync(_configurationAccessor.Configuration["IdentityClients:Default:Authority"]); + var disco = await client.GetDiscoveryDocumentAsync(_configuration["IdentityClients:Default:Authority"]); if (disco.IsError) { Console.WriteLine(disco.Error); @@ -116,11 +117,11 @@ namespace MyCompanyName.MyProjectName var tokenResponse = await client.RequestPasswordTokenAsync(new PasswordTokenRequest { Address = disco.TokenEndpoint, - ClientId = _configurationAccessor.Configuration["IdentityClients:Default:ClientId"], - ClientSecret = _configurationAccessor.Configuration["IdentityClients:Default:ClientSecret"], - UserName = _configurationAccessor.Configuration["IdentityClients:Default:UserName"], - Password = _configurationAccessor.Configuration["IdentityClients:Default:UserPassword"], - Scope = _configurationAccessor.Configuration["IdentityClients:Default:Scope"] + ClientId = _configuration["IdentityClients:Default:ClientId"], + ClientSecret = _configuration["IdentityClients:Default:ClientSecret"], + UserName = _configuration["IdentityClients:Default:UserName"], + Password = _configuration["IdentityClients:Default:UserPassword"], + Scope = _configuration["IdentityClients:Default:Scope"] }); if (tokenResponse.IsError) @@ -137,7 +138,7 @@ namespace MyCompanyName.MyProjectName { httpClient.SetBearerToken(tokenResponse.AccessToken); - var url = _configurationAccessor.Configuration["RemoteServices:MyProjectName:BaseUrl"] + + var url = _configuration["RemoteServices:MyProjectName:BaseUrl"] + "api/MyProjectName/sample/authorized"; var responseMessage = await httpClient.GetAsync(url); From c5cf2ae24a353fbe948dec2a1ffa430df7b0053d Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 11 Oct 2019 20:14:21 +0800 Subject: [PATCH 02/96] Fix unit test. --- .../Acme.BookStore.Domain.Shared.csproj | 16 +- .../Acme.BookStore.EntityFrameworkCore.csproj | 18 +- .../src/Acme.BookStore.Domain/Book.cs | 5 + .../wwwroot/libs/luxon/luxon.js | 8196 +++++++++++++++++ .../wwwroot/libs/luxon/luxon.js.map | 1 + .../wwwroot/libs/luxon/luxon.min.js | 1 + .../wwwroot/libs/luxon/luxon.min.js.map | 1 + 7 files changed, 8221 insertions(+), 17 deletions(-) create mode 100644 samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js create mode 100644 samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js.map create mode 100644 samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js create mode 100644 samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js.map diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj index f0b9cc6165..d0d0942a4a 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/Acme.BookStore.Domain.Shared.csproj @@ -8,14 +8,14 @@ - - - - - - - - + + + + + + + + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj index 6c4dcb4a88..09c8b542db 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Domain/Book.cs b/samples/BookStore/src/Acme.BookStore.Domain/Book.cs index 3fe42f0d18..98c10288e3 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/Book.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/Book.cs @@ -13,6 +13,11 @@ namespace Acme.BookStore public float Price { get; set; } + protected Book() + { + + } + public Book(Guid id, string name, BookType type, DateTime publishDate, float price) :base(id) { diff --git a/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js new file mode 100644 index 0000000000..4299965949 --- /dev/null +++ b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js @@ -0,0 +1,8196 @@ +var luxon = (function (exports) { + 'use strict'; + + function _defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + + function _createClass(Constructor, protoProps, staticProps) { + if (protoProps) _defineProperties(Constructor.prototype, protoProps); + if (staticProps) _defineProperties(Constructor, staticProps); + return Constructor; + } + + function _inheritsLoose(subClass, superClass) { + subClass.prototype = Object.create(superClass.prototype); + subClass.prototype.constructor = subClass; + subClass.__proto__ = superClass; + } + + function _getPrototypeOf(o) { + _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { + return o.__proto__ || Object.getPrototypeOf(o); + }; + return _getPrototypeOf(o); + } + + function _setPrototypeOf(o, p) { + _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { + o.__proto__ = p; + return o; + }; + + return _setPrototypeOf(o, p); + } + + function isNativeReflectConstruct() { + if (typeof Reflect === "undefined" || !Reflect.construct) return false; + if (Reflect.construct.sham) return false; + if (typeof Proxy === "function") return true; + + try { + Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); + return true; + } catch (e) { + return false; + } + } + + function _construct(Parent, args, Class) { + if (isNativeReflectConstruct()) { + _construct = Reflect.construct; + } else { + _construct = function _construct(Parent, args, Class) { + var a = [null]; + a.push.apply(a, args); + var Constructor = Function.bind.apply(Parent, a); + var instance = new Constructor(); + if (Class) _setPrototypeOf(instance, Class.prototype); + return instance; + }; + } + + return _construct.apply(null, arguments); + } + + function _isNativeFunction(fn) { + return Function.toString.call(fn).indexOf("[native code]") !== -1; + } + + function _wrapNativeSuper(Class) { + var _cache = typeof Map === "function" ? new Map() : undefined; + + _wrapNativeSuper = function _wrapNativeSuper(Class) { + if (Class === null || !_isNativeFunction(Class)) return Class; + + if (typeof Class !== "function") { + throw new TypeError("Super expression must either be null or a function"); + } + + if (typeof _cache !== "undefined") { + if (_cache.has(Class)) return _cache.get(Class); + + _cache.set(Class, Wrapper); + } + + function Wrapper() { + return _construct(Class, arguments, _getPrototypeOf(this).constructor); + } + + Wrapper.prototype = Object.create(Class.prototype, { + constructor: { + value: Wrapper, + enumerable: false, + writable: true, + configurable: true + } + }); + return _setPrototypeOf(Wrapper, Class); + }; + + return _wrapNativeSuper(Class); + } + + // these aren't really private, but nor are they really useful to document + + /** + * @private + */ + var LuxonError = + /*#__PURE__*/ + function (_Error) { + _inheritsLoose(LuxonError, _Error); + + function LuxonError() { + return _Error.apply(this, arguments) || this; + } + + return LuxonError; + }(_wrapNativeSuper(Error)); + /** + * @private + */ + + + var InvalidDateTimeError = + /*#__PURE__*/ + function (_LuxonError) { + _inheritsLoose(InvalidDateTimeError, _LuxonError); + + function InvalidDateTimeError(reason) { + return _LuxonError.call(this, "Invalid DateTime: " + reason.toMessage()) || this; + } + + return InvalidDateTimeError; + }(LuxonError); + /** + * @private + */ + + var InvalidIntervalError = + /*#__PURE__*/ + function (_LuxonError2) { + _inheritsLoose(InvalidIntervalError, _LuxonError2); + + function InvalidIntervalError(reason) { + return _LuxonError2.call(this, "Invalid Interval: " + reason.toMessage()) || this; + } + + return InvalidIntervalError; + }(LuxonError); + /** + * @private + */ + + var InvalidDurationError = + /*#__PURE__*/ + function (_LuxonError3) { + _inheritsLoose(InvalidDurationError, _LuxonError3); + + function InvalidDurationError(reason) { + return _LuxonError3.call(this, "Invalid Duration: " + reason.toMessage()) || this; + } + + return InvalidDurationError; + }(LuxonError); + /** + * @private + */ + + var ConflictingSpecificationError = + /*#__PURE__*/ + function (_LuxonError4) { + _inheritsLoose(ConflictingSpecificationError, _LuxonError4); + + function ConflictingSpecificationError() { + return _LuxonError4.apply(this, arguments) || this; + } + + return ConflictingSpecificationError; + }(LuxonError); + /** + * @private + */ + + var InvalidUnitError = + /*#__PURE__*/ + function (_LuxonError5) { + _inheritsLoose(InvalidUnitError, _LuxonError5); + + function InvalidUnitError(unit) { + return _LuxonError5.call(this, "Invalid unit " + unit) || this; + } + + return InvalidUnitError; + }(LuxonError); + /** + * @private + */ + + var InvalidArgumentError = + /*#__PURE__*/ + function (_LuxonError6) { + _inheritsLoose(InvalidArgumentError, _LuxonError6); + + function InvalidArgumentError() { + return _LuxonError6.apply(this, arguments) || this; + } + + return InvalidArgumentError; + }(LuxonError); + /** + * @private + */ + + var ZoneIsAbstractError = + /*#__PURE__*/ + function (_LuxonError7) { + _inheritsLoose(ZoneIsAbstractError, _LuxonError7); + + function ZoneIsAbstractError() { + return _LuxonError7.call(this, "Zone is an abstract class") || this; + } + + return ZoneIsAbstractError; + }(LuxonError); + + /* + This is just a junk drawer, containing anything used across multiple classes. + Because Luxon is small(ish), this should stay small and we won't worry about splitting + it up into, say, parsingUtil.js and basicUtil.js and so on. But they are divided up by feature area. + */ + /** + * @private + */ + // TYPES + + function isUndefined(o) { + return typeof o === "undefined"; + } + function isNumber(o) { + return typeof o === "number"; + } + function isInteger(o) { + return typeof o === "number" && o % 1 === 0; + } + function isString(o) { + return typeof o === "string"; + } + function isDate(o) { + return Object.prototype.toString.call(o) === "[object Date]"; + } // CAPABILITIES + + function hasIntl() { + try { + return typeof Intl !== "undefined" && Intl.DateTimeFormat; + } catch (e) { + return false; + } + } + function hasFormatToParts() { + return !isUndefined(Intl.DateTimeFormat.prototype.formatToParts); + } + function hasRelative() { + try { + return typeof Intl !== "undefined" && !!Intl.RelativeTimeFormat; + } catch (e) { + return false; + } + } // OBJECTS AND ARRAYS + + function maybeArray(thing) { + return Array.isArray(thing) ? thing : [thing]; + } + function bestBy(arr, by, compare) { + if (arr.length === 0) { + return undefined; + } + + return arr.reduce(function (best, next) { + var pair = [by(next), next]; + + if (!best) { + return pair; + } else if (compare(best[0], pair[0]) === best[0]) { + return best; + } else { + return pair; + } + }, null)[1]; + } + function pick(obj, keys) { + return keys.reduce(function (a, k) { + a[k] = obj[k]; + return a; + }, {}); + } + function hasOwnProperty(obj, prop) { + return Object.prototype.hasOwnProperty.call(obj, prop); + } // NUMBERS AND STRINGS + + function integerBetween(thing, bottom, top) { + return isInteger(thing) && thing >= bottom && thing <= top; + } // x % n but takes the sign of n instead of x + + function floorMod(x, n) { + return x - n * Math.floor(x / n); + } + function padStart(input, n) { + if (n === void 0) { + n = 2; + } + + if (input.toString().length < n) { + return ("0".repeat(n) + input).slice(-n); + } else { + return input.toString(); + } + } + function parseInteger(string) { + if (isUndefined(string) || string === null || string === "") { + return undefined; + } else { + return parseInt(string, 10); + } + } + function parseMillis(fraction) { + // Return undefined (instead of 0) in these cases, where fraction is not set + if (isUndefined(fraction) || fraction === null || fraction === "") { + return undefined; + } else { + var f = parseFloat("0." + fraction) * 1000; + return Math.floor(f); + } + } + function roundTo(number, digits, towardZero) { + if (towardZero === void 0) { + towardZero = false; + } + + var factor = Math.pow(10, digits), + rounder = towardZero ? Math.trunc : Math.round; + return rounder(number * factor) / factor; + } // DATE BASICS + + function isLeapYear(year) { + return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0); + } + function daysInYear(year) { + return isLeapYear(year) ? 366 : 365; + } + function daysInMonth(year, month) { + var modMonth = floorMod(month - 1, 12) + 1, + modYear = year + (month - modMonth) / 12; + + if (modMonth === 2) { + return isLeapYear(modYear) ? 29 : 28; + } else { + return [31, null, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][modMonth - 1]; + } + } // covert a calendar object to a local timestamp (epoch, but with the offset baked in) + + function objToLocalTS(obj) { + var d = Date.UTC(obj.year, obj.month - 1, obj.day, obj.hour, obj.minute, obj.second, obj.millisecond); // for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that + + if (obj.year < 100 && obj.year >= 0) { + d = new Date(d); + d.setUTCFullYear(d.getUTCFullYear() - 1900); + } + + return +d; + } + function weeksInWeekYear(weekYear) { + var p1 = (weekYear + Math.floor(weekYear / 4) - Math.floor(weekYear / 100) + Math.floor(weekYear / 400)) % 7, + last = weekYear - 1, + p2 = (last + Math.floor(last / 4) - Math.floor(last / 100) + Math.floor(last / 400)) % 7; + return p1 === 4 || p2 === 3 ? 53 : 52; + } + function untruncateYear(year) { + if (year > 99) { + return year; + } else return year > 60 ? 1900 + year : 2000 + year; + } // PARSING + + function parseZoneInfo(ts, offsetFormat, locale, timeZone) { + if (timeZone === void 0) { + timeZone = null; + } + + var date = new Date(ts), + intlOpts = { + hour12: false, + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit" + }; + + if (timeZone) { + intlOpts.timeZone = timeZone; + } + + var modified = Object.assign({ + timeZoneName: offsetFormat + }, intlOpts), + intl = hasIntl(); + + if (intl && hasFormatToParts()) { + var parsed = new Intl.DateTimeFormat(locale, modified).formatToParts(date).find(function (m) { + return m.type.toLowerCase() === "timezonename"; + }); + return parsed ? parsed.value : null; + } else if (intl) { + // this probably doesn't work for all locales + var without = new Intl.DateTimeFormat(locale, intlOpts).format(date), + included = new Intl.DateTimeFormat(locale, modified).format(date), + diffed = included.substring(without.length), + trimmed = diffed.replace(/^[, \u200e]+/, ""); + return trimmed; + } else { + return null; + } + } // signedOffset('-5', '30') -> -330 + + function signedOffset(offHourStr, offMinuteStr) { + var offHour = parseInt(offHourStr, 10) || 0, + offMin = parseInt(offMinuteStr, 10) || 0, + offMinSigned = offHour < 0 ? -offMin : offMin; + return offHour * 60 + offMinSigned; + } // COERCION + + function asNumber(value) { + var numericValue = Number(value); + if (typeof value === "boolean" || value === "" || Number.isNaN(numericValue)) throw new InvalidArgumentError("Invalid unit value " + value); + return numericValue; + } + + function normalizeObject(obj, normalizer, nonUnitKeys) { + var normalized = {}; + + for (var u in obj) { + if (hasOwnProperty(obj, u)) { + if (nonUnitKeys.indexOf(u) >= 0) continue; + var v = obj[u]; + if (v === undefined || v === null) continue; + normalized[normalizer(u)] = asNumber(v); + } + } + + return normalized; + } + function formatOffset(offset, format) { + var hours = Math.trunc(offset / 60), + minutes = Math.abs(offset % 60), + sign = hours >= 0 ? "+" : "-", + base = "" + sign + Math.abs(hours); + + switch (format) { + case "short": + return "" + sign + padStart(Math.abs(hours), 2) + ":" + padStart(minutes, 2); + + case "narrow": + return minutes > 0 ? base + ":" + minutes : base; + + case "techie": + return "" + sign + padStart(Math.abs(hours), 2) + padStart(minutes, 2); + + default: + throw new RangeError("Value format " + format + " is out of range for property format"); + } + } + function timeObject(obj) { + return pick(obj, ["hour", "minute", "second", "millisecond"]); + } + var ianaRegex = /[A-Za-z_+-]{1,256}(:?\/[A-Za-z_+-]{1,256}(\/[A-Za-z_+-]{1,256})?)?/; + + /** + * @private + */ + var n = "numeric", + s = "short", + l = "long", + d2 = "2-digit"; + var DATE_SHORT = { + year: n, + month: n, + day: n + }; + var DATE_MED = { + year: n, + month: s, + day: n + }; + var DATE_FULL = { + year: n, + month: l, + day: n + }; + var DATE_HUGE = { + year: n, + month: l, + day: n, + weekday: l + }; + var TIME_SIMPLE = { + hour: n, + minute: d2 + }; + var TIME_WITH_SECONDS = { + hour: n, + minute: d2, + second: d2 + }; + var TIME_WITH_SHORT_OFFSET = { + hour: n, + minute: d2, + second: d2, + timeZoneName: s + }; + var TIME_WITH_LONG_OFFSET = { + hour: n, + minute: d2, + second: d2, + timeZoneName: l + }; + var TIME_24_SIMPLE = { + hour: n, + minute: d2, + hour12: false + }; + /** + * {@link toLocaleString}; format like '09:30:23', always 24-hour. + */ + + var TIME_24_WITH_SECONDS = { + hour: n, + minute: d2, + second: d2, + hour12: false + }; + /** + * {@link toLocaleString}; format like '09:30:23 EDT', always 24-hour. + */ + + var TIME_24_WITH_SHORT_OFFSET = { + hour: n, + minute: d2, + second: d2, + hour12: false, + timeZoneName: s + }; + /** + * {@link toLocaleString}; format like '09:30:23 Eastern Daylight Time', always 24-hour. + */ + + var TIME_24_WITH_LONG_OFFSET = { + hour: n, + minute: d2, + second: d2, + hour12: false, + timeZoneName: l + }; + /** + * {@link toLocaleString}; format like '10/14/1983, 9:30 AM'. Only 12-hour if the locale is. + */ + + var DATETIME_SHORT = { + year: n, + month: n, + day: n, + hour: n, + minute: d2 + }; + /** + * {@link toLocaleString}; format like '10/14/1983, 9:30:33 AM'. Only 12-hour if the locale is. + */ + + var DATETIME_SHORT_WITH_SECONDS = { + year: n, + month: n, + day: n, + hour: n, + minute: d2, + second: d2 + }; + var DATETIME_MED = { + year: n, + month: s, + day: n, + hour: n, + minute: d2 + }; + var DATETIME_MED_WITH_SECONDS = { + year: n, + month: s, + day: n, + hour: n, + minute: d2, + second: d2 + }; + var DATETIME_MED_WITH_WEEKDAY = { + year: n, + month: s, + day: n, + weekday: s, + hour: n, + minute: d2 + }; + var DATETIME_FULL = { + year: n, + month: l, + day: n, + hour: n, + minute: d2, + timeZoneName: s + }; + var DATETIME_FULL_WITH_SECONDS = { + year: n, + month: l, + day: n, + hour: n, + minute: d2, + second: d2, + timeZoneName: s + }; + var DATETIME_HUGE = { + year: n, + month: l, + day: n, + weekday: l, + hour: n, + minute: d2, + timeZoneName: l + }; + var DATETIME_HUGE_WITH_SECONDS = { + year: n, + month: l, + day: n, + weekday: l, + hour: n, + minute: d2, + second: d2, + timeZoneName: l + }; + + function stringify(obj) { + return JSON.stringify(obj, Object.keys(obj).sort()); + } + /** + * @private + */ + + + var monthsLong = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; + var monthsShort = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + var monthsNarrow = ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"]; + function months(length) { + switch (length) { + case "narrow": + return monthsNarrow; + + case "short": + return monthsShort; + + case "long": + return monthsLong; + + case "numeric": + return ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"]; + + case "2-digit": + return ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"]; + + default: + return null; + } + } + var weekdaysLong = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]; + var weekdaysShort = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]; + var weekdaysNarrow = ["M", "T", "W", "T", "F", "S", "S"]; + function weekdays(length) { + switch (length) { + case "narrow": + return weekdaysNarrow; + + case "short": + return weekdaysShort; + + case "long": + return weekdaysLong; + + case "numeric": + return ["1", "2", "3", "4", "5", "6", "7"]; + + default: + return null; + } + } + var meridiems = ["AM", "PM"]; + var erasLong = ["Before Christ", "Anno Domini"]; + var erasShort = ["BC", "AD"]; + var erasNarrow = ["B", "A"]; + function eras(length) { + switch (length) { + case "narrow": + return erasNarrow; + + case "short": + return erasShort; + + case "long": + return erasLong; + + default: + return null; + } + } + function meridiemForDateTime(dt) { + return meridiems[dt.hour < 12 ? 0 : 1]; + } + function weekdayForDateTime(dt, length) { + return weekdays(length)[dt.weekday - 1]; + } + function monthForDateTime(dt, length) { + return months(length)[dt.month - 1]; + } + function eraForDateTime(dt, length) { + return eras(length)[dt.year < 0 ? 0 : 1]; + } + function formatRelativeTime(unit, count, numeric, narrow) { + if (numeric === void 0) { + numeric = "always"; + } + + if (narrow === void 0) { + narrow = false; + } + + var units = { + years: ["year", "yr."], + quarters: ["quarter", "qtr."], + months: ["month", "mo."], + weeks: ["week", "wk."], + days: ["day", "day", "days"], + hours: ["hour", "hr."], + minutes: ["minute", "min."], + seconds: ["second", "sec."] + }; + var lastable = ["hours", "minutes", "seconds"].indexOf(unit) === -1; + + if (numeric === "auto" && lastable) { + var isDay = unit === "days"; + + switch (count) { + case 1: + return isDay ? "tomorrow" : "next " + units[unit][0]; + + case -1: + return isDay ? "yesterday" : "last " + units[unit][0]; + + case 0: + return isDay ? "today" : "this " + units[unit][0]; + + default: // fall through + + } + } + + var isInPast = Object.is(count, -0) || count < 0, + fmtValue = Math.abs(count), + singular = fmtValue === 1, + lilUnits = units[unit], + fmtUnit = narrow ? singular ? lilUnits[1] : lilUnits[2] || lilUnits[1] : singular ? units[unit][0] : unit; + return isInPast ? fmtValue + " " + fmtUnit + " ago" : "in " + fmtValue + " " + fmtUnit; + } + function formatString(knownFormat) { + // these all have the offsets removed because we don't have access to them + // without all the intl stuff this is backfilling + var filtered = pick(knownFormat, ["weekday", "era", "year", "month", "day", "hour", "minute", "second", "timeZoneName", "hour12"]), + key = stringify(filtered), + dateTimeHuge = "EEEE, LLLL d, yyyy, h:mm a"; + + switch (key) { + case stringify(DATE_SHORT): + return "M/d/yyyy"; + + case stringify(DATE_MED): + return "LLL d, yyyy"; + + case stringify(DATE_FULL): + return "LLLL d, yyyy"; + + case stringify(DATE_HUGE): + return "EEEE, LLLL d, yyyy"; + + case stringify(TIME_SIMPLE): + return "h:mm a"; + + case stringify(TIME_WITH_SECONDS): + return "h:mm:ss a"; + + case stringify(TIME_WITH_SHORT_OFFSET): + return "h:mm a"; + + case stringify(TIME_WITH_LONG_OFFSET): + return "h:mm a"; + + case stringify(TIME_24_SIMPLE): + return "HH:mm"; + + case stringify(TIME_24_WITH_SECONDS): + return "HH:mm:ss"; + + case stringify(TIME_24_WITH_SHORT_OFFSET): + return "HH:mm"; + + case stringify(TIME_24_WITH_LONG_OFFSET): + return "HH:mm"; + + case stringify(DATETIME_SHORT): + return "M/d/yyyy, h:mm a"; + + case stringify(DATETIME_MED): + return "LLL d, yyyy, h:mm a"; + + case stringify(DATETIME_FULL): + return "LLLL d, yyyy, h:mm a"; + + case stringify(DATETIME_HUGE): + return dateTimeHuge; + + case stringify(DATETIME_SHORT_WITH_SECONDS): + return "M/d/yyyy, h:mm:ss a"; + + case stringify(DATETIME_MED_WITH_SECONDS): + return "LLL d, yyyy, h:mm:ss a"; + + case stringify(DATETIME_MED_WITH_WEEKDAY): + return "EEE, d LLL yyyy, h:mm a"; + + case stringify(DATETIME_FULL_WITH_SECONDS): + return "LLLL d, yyyy, h:mm:ss a"; + + case stringify(DATETIME_HUGE_WITH_SECONDS): + return "EEEE, LLLL d, yyyy, h:mm:ss a"; + + default: + return dateTimeHuge; + } + } + + /** + * @interface + */ + + var Zone = + /*#__PURE__*/ + function () { + function Zone() {} + + var _proto = Zone.prototype; + + /** + * Returns the offset's common name (such as EST) at the specified timestamp + * @abstract + * @param {number} ts - Epoch milliseconds for which to get the name + * @param {Object} opts - Options to affect the format + * @param {string} opts.format - What style of offset to return. Accepts 'long' or 'short'. + * @param {string} opts.locale - What locale to return the offset name in. + * @return {string} + */ + _proto.offsetName = function offsetName(ts, opts) { + throw new ZoneIsAbstractError(); + } + /** + * Returns the offset's value as a string + * @abstract + * @param {number} ts - Epoch milliseconds for which to get the offset + * @param {string} format - What style of offset to return. + * Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively + * @return {string} + */ + ; + + _proto.formatOffset = function formatOffset(ts, format) { + throw new ZoneIsAbstractError(); + } + /** + * Return the offset in minutes for this zone at the specified timestamp. + * @abstract + * @param {number} ts - Epoch milliseconds for which to compute the offset + * @return {number} + */ + ; + + _proto.offset = function offset(ts) { + throw new ZoneIsAbstractError(); + } + /** + * Return whether this Zone is equal to another zone + * @abstract + * @param {Zone} otherZone - the zone to compare + * @return {boolean} + */ + ; + + _proto.equals = function equals(otherZone) { + throw new ZoneIsAbstractError(); + } + /** + * Return whether this Zone is valid. + * @abstract + * @type {boolean} + */ + ; + + _createClass(Zone, [{ + key: "type", + + /** + * The type of zone + * @abstract + * @type {string} + */ + get: function get() { + throw new ZoneIsAbstractError(); + } + /** + * The name of this zone. + * @abstract + * @type {string} + */ + + }, { + key: "name", + get: function get() { + throw new ZoneIsAbstractError(); + } + /** + * Returns whether the offset is known to be fixed for the whole year. + * @abstract + * @type {boolean} + */ + + }, { + key: "universal", + get: function get() { + throw new ZoneIsAbstractError(); + } + }, { + key: "isValid", + get: function get() { + throw new ZoneIsAbstractError(); + } + }]); + + return Zone; + }(); + + var singleton = null; + /** + * Represents the local zone for this Javascript environment. + * @implements {Zone} + */ + + var LocalZone = + /*#__PURE__*/ + function (_Zone) { + _inheritsLoose(LocalZone, _Zone); + + function LocalZone() { + return _Zone.apply(this, arguments) || this; + } + + var _proto = LocalZone.prototype; + + /** @override **/ + _proto.offsetName = function offsetName(ts, _ref) { + var format = _ref.format, + locale = _ref.locale; + return parseZoneInfo(ts, format, locale); + } + /** @override **/ + ; + + _proto.formatOffset = function formatOffset$1(ts, format) { + return formatOffset(this.offset(ts), format); + } + /** @override **/ + ; + + _proto.offset = function offset(ts) { + return -new Date(ts).getTimezoneOffset(); + } + /** @override **/ + ; + + _proto.equals = function equals(otherZone) { + return otherZone.type === "local"; + } + /** @override **/ + ; + + _createClass(LocalZone, [{ + key: "type", + + /** @override **/ + get: function get() { + return "local"; + } + /** @override **/ + + }, { + key: "name", + get: function get() { + if (hasIntl()) { + return new Intl.DateTimeFormat().resolvedOptions().timeZone; + } else return "local"; + } + /** @override **/ + + }, { + key: "universal", + get: function get() { + return false; + } + }, { + key: "isValid", + get: function get() { + return true; + } + }], [{ + key: "instance", + + /** + * Get a singleton instance of the local zone + * @return {LocalZone} + */ + get: function get() { + if (singleton === null) { + singleton = new LocalZone(); + } + + return singleton; + } + }]); + + return LocalZone; + }(Zone); + + var matchingRegex = RegExp("^" + ianaRegex.source + "$"); + var dtfCache = {}; + + function makeDTF(zone) { + if (!dtfCache[zone]) { + dtfCache[zone] = new Intl.DateTimeFormat("en-US", { + hour12: false, + timeZone: zone, + year: "numeric", + month: "2-digit", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + second: "2-digit" + }); + } + + return dtfCache[zone]; + } + + var typeToPos = { + year: 0, + month: 1, + day: 2, + hour: 3, + minute: 4, + second: 5 + }; + + function hackyOffset(dtf, date) { + var formatted = dtf.format(date).replace(/\u200E/g, ""), + parsed = /(\d+)\/(\d+)\/(\d+),? (\d+):(\d+):(\d+)/.exec(formatted), + fMonth = parsed[1], + fDay = parsed[2], + fYear = parsed[3], + fHour = parsed[4], + fMinute = parsed[5], + fSecond = parsed[6]; + return [fYear, fMonth, fDay, fHour, fMinute, fSecond]; + } + + function partsOffset(dtf, date) { + var formatted = dtf.formatToParts(date), + filled = []; + + for (var i = 0; i < formatted.length; i++) { + var _formatted$i = formatted[i], + type = _formatted$i.type, + value = _formatted$i.value, + pos = typeToPos[type]; + + if (!isUndefined(pos)) { + filled[pos] = parseInt(value, 10); + } + } + + return filled; + } + + var ianaZoneCache = {}; + /** + * A zone identified by an IANA identifier, like America/New_York + * @implements {Zone} + */ + + var IANAZone = + /*#__PURE__*/ + function (_Zone) { + _inheritsLoose(IANAZone, _Zone); + + /** + * @param {string} name - Zone name + * @return {IANAZone} + */ + IANAZone.create = function create(name) { + if (!ianaZoneCache[name]) { + ianaZoneCache[name] = new IANAZone(name); + } + + return ianaZoneCache[name]; + } + /** + * Reset local caches. Should only be necessary in testing scenarios. + * @return {void} + */ + ; + + IANAZone.resetCache = function resetCache() { + ianaZoneCache = {}; + dtfCache = {}; + } + /** + * Returns whether the provided string is a valid specifier. This only checks the string's format, not that the specifier identifies a known zone; see isValidZone for that. + * @param {string} s - The string to check validity on + * @example IANAZone.isValidSpecifier("America/New_York") //=> true + * @example IANAZone.isValidSpecifier("Fantasia/Castle") //=> true + * @example IANAZone.isValidSpecifier("Sport~~blorp") //=> false + * @return {boolean} + */ + ; + + IANAZone.isValidSpecifier = function isValidSpecifier(s) { + return !!(s && s.match(matchingRegex)); + } + /** + * Returns whether the provided string identifies a real zone + * @param {string} zone - The string to check + * @example IANAZone.isValidZone("America/New_York") //=> true + * @example IANAZone.isValidZone("Fantasia/Castle") //=> false + * @example IANAZone.isValidZone("Sport~~blorp") //=> false + * @return {boolean} + */ + ; + + IANAZone.isValidZone = function isValidZone(zone) { + try { + new Intl.DateTimeFormat("en-US", { + timeZone: zone + }).format(); + return true; + } catch (e) { + return false; + } + } // Etc/GMT+8 -> -480 + + /** @ignore */ + ; + + IANAZone.parseGMTOffset = function parseGMTOffset(specifier) { + if (specifier) { + var match = specifier.match(/^Etc\/GMT([+-]\d{1,2})$/i); + + if (match) { + return -60 * parseInt(match[1]); + } + } + + return null; + }; + + function IANAZone(name) { + var _this; + + _this = _Zone.call(this) || this; + /** @private **/ + + _this.zoneName = name; + /** @private **/ + + _this.valid = IANAZone.isValidZone(name); + return _this; + } + /** @override **/ + + + var _proto = IANAZone.prototype; + + /** @override **/ + _proto.offsetName = function offsetName(ts, _ref) { + var format = _ref.format, + locale = _ref.locale; + return parseZoneInfo(ts, format, locale, this.name); + } + /** @override **/ + ; + + _proto.formatOffset = function formatOffset$1(ts, format) { + return formatOffset(this.offset(ts), format); + } + /** @override **/ + ; + + _proto.offset = function offset(ts) { + var date = new Date(ts), + dtf = makeDTF(this.name), + _ref2 = dtf.formatToParts ? partsOffset(dtf, date) : hackyOffset(dtf, date), + year = _ref2[0], + month = _ref2[1], + day = _ref2[2], + hour = _ref2[3], + minute = _ref2[4], + second = _ref2[5]; + + var asUTC = objToLocalTS({ + year: year, + month: month, + day: day, + hour: hour, + minute: minute, + second: second, + millisecond: 0 + }); + var asTS = date.valueOf(); + asTS -= asTS % 1000; + return (asUTC - asTS) / (60 * 1000); + } + /** @override **/ + ; + + _proto.equals = function equals(otherZone) { + return otherZone.type === "iana" && otherZone.name === this.name; + } + /** @override **/ + ; + + _createClass(IANAZone, [{ + key: "type", + get: function get() { + return "iana"; + } + /** @override **/ + + }, { + key: "name", + get: function get() { + return this.zoneName; + } + /** @override **/ + + }, { + key: "universal", + get: function get() { + return false; + } + }, { + key: "isValid", + get: function get() { + return this.valid; + } + }]); + + return IANAZone; + }(Zone); + + var singleton$1 = null; + /** + * A zone with a fixed offset (i.e. no DST) + * @implements {Zone} + */ + + var FixedOffsetZone = + /*#__PURE__*/ + function (_Zone) { + _inheritsLoose(FixedOffsetZone, _Zone); + + /** + * Get an instance with a specified offset + * @param {number} offset - The offset in minutes + * @return {FixedOffsetZone} + */ + FixedOffsetZone.instance = function instance(offset) { + return offset === 0 ? FixedOffsetZone.utcInstance : new FixedOffsetZone(offset); + } + /** + * Get an instance of FixedOffsetZone from a UTC offset string, like "UTC+6" + * @param {string} s - The offset string to parse + * @example FixedOffsetZone.parseSpecifier("UTC+6") + * @example FixedOffsetZone.parseSpecifier("UTC+06") + * @example FixedOffsetZone.parseSpecifier("UTC-6:00") + * @return {FixedOffsetZone} + */ + ; + + FixedOffsetZone.parseSpecifier = function parseSpecifier(s) { + if (s) { + var r = s.match(/^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$/i); + + if (r) { + return new FixedOffsetZone(signedOffset(r[1], r[2])); + } + } + + return null; + }; + + _createClass(FixedOffsetZone, null, [{ + key: "utcInstance", + + /** + * Get a singleton instance of UTC + * @return {FixedOffsetZone} + */ + get: function get() { + if (singleton$1 === null) { + singleton$1 = new FixedOffsetZone(0); + } + + return singleton$1; + } + }]); + + function FixedOffsetZone(offset) { + var _this; + + _this = _Zone.call(this) || this; + /** @private **/ + + _this.fixed = offset; + return _this; + } + /** @override **/ + + + var _proto = FixedOffsetZone.prototype; + + /** @override **/ + _proto.offsetName = function offsetName() { + return this.name; + } + /** @override **/ + ; + + _proto.formatOffset = function formatOffset$1(ts, format) { + return formatOffset(this.fixed, format); + } + /** @override **/ + ; + + /** @override **/ + _proto.offset = function offset() { + return this.fixed; + } + /** @override **/ + ; + + _proto.equals = function equals(otherZone) { + return otherZone.type === "fixed" && otherZone.fixed === this.fixed; + } + /** @override **/ + ; + + _createClass(FixedOffsetZone, [{ + key: "type", + get: function get() { + return "fixed"; + } + /** @override **/ + + }, { + key: "name", + get: function get() { + return this.fixed === 0 ? "UTC" : "UTC" + formatOffset(this.fixed, "narrow"); + } + }, { + key: "universal", + get: function get() { + return true; + } + }, { + key: "isValid", + get: function get() { + return true; + } + }]); + + return FixedOffsetZone; + }(Zone); + + /** + * A zone that failed to parse. You should never need to instantiate this. + * @implements {Zone} + */ + + var InvalidZone = + /*#__PURE__*/ + function (_Zone) { + _inheritsLoose(InvalidZone, _Zone); + + function InvalidZone(zoneName) { + var _this; + + _this = _Zone.call(this) || this; + /** @private */ + + _this.zoneName = zoneName; + return _this; + } + /** @override **/ + + + var _proto = InvalidZone.prototype; + + /** @override **/ + _proto.offsetName = function offsetName() { + return null; + } + /** @override **/ + ; + + _proto.formatOffset = function formatOffset() { + return ""; + } + /** @override **/ + ; + + _proto.offset = function offset() { + return NaN; + } + /** @override **/ + ; + + _proto.equals = function equals() { + return false; + } + /** @override **/ + ; + + _createClass(InvalidZone, [{ + key: "type", + get: function get() { + return "invalid"; + } + /** @override **/ + + }, { + key: "name", + get: function get() { + return this.zoneName; + } + /** @override **/ + + }, { + key: "universal", + get: function get() { + return false; + } + }, { + key: "isValid", + get: function get() { + return false; + } + }]); + + return InvalidZone; + }(Zone); + + /** + * @private + */ + function normalizeZone(input, defaultZone) { + var offset; + + if (isUndefined(input) || input === null) { + return defaultZone; + } else if (input instanceof Zone) { + return input; + } else if (isString(input)) { + var lowered = input.toLowerCase(); + if (lowered === "local") return defaultZone;else if (lowered === "utc" || lowered === "gmt") return FixedOffsetZone.utcInstance;else if ((offset = IANAZone.parseGMTOffset(input)) != null) { + // handle Etc/GMT-4, which V8 chokes on + return FixedOffsetZone.instance(offset); + } else if (IANAZone.isValidSpecifier(lowered)) return IANAZone.create(input);else return FixedOffsetZone.parseSpecifier(lowered) || new InvalidZone(input); + } else if (isNumber(input)) { + return FixedOffsetZone.instance(input); + } else if (typeof input === "object" && input.offset && typeof input.offset === "number") { + // This is dumb, but the instanceof check above doesn't seem to really work + // so we're duck checking it + return input; + } else { + return new InvalidZone(input); + } + } + + var now = function now() { + return Date.now(); + }, + defaultZone = null, + // not setting this directly to LocalZone.instance bc loading order issues + defaultLocale = null, + defaultNumberingSystem = null, + defaultOutputCalendar = null, + throwOnInvalid = false; + /** + * Settings contains static getters and setters that control Luxon's overall behavior. Luxon is a simple library with few options, but the ones it does have live here. + */ + + + var Settings = + /*#__PURE__*/ + function () { + function Settings() {} + + /** + * Reset Luxon's global caches. Should only be necessary in testing scenarios. + * @return {void} + */ + Settings.resetCaches = function resetCaches() { + Locale.resetCache(); + IANAZone.resetCache(); + }; + + _createClass(Settings, null, [{ + key: "now", + + /** + * Get the callback for returning the current timestamp. + * @type {function} + */ + get: function get() { + return now; + } + /** + * Set the callback for returning the current timestamp. + * The function should return a number, which will be interpreted as an Epoch millisecond count + * @type {function} + * @example Settings.now = () => Date.now() + 3000 // pretend it is 3 seconds in the future + * @example Settings.now = () => 0 // always pretend it's Jan 1, 1970 at midnight in UTC time + */ + , + set: function set(n) { + now = n; + } + /** + * Get the default time zone to create DateTimes in. + * @type {string} + */ + + }, { + key: "defaultZoneName", + get: function get() { + return Settings.defaultZone.name; + } + /** + * Set the default time zone to create DateTimes in. Does not affect existing instances. + * @type {string} + */ + , + set: function set(z) { + if (!z) { + defaultZone = null; + } else { + defaultZone = normalizeZone(z); + } + } + /** + * Get the default time zone object to create DateTimes in. Does not affect existing instances. + * @type {Zone} + */ + + }, { + key: "defaultZone", + get: function get() { + return defaultZone || LocalZone.instance; + } + /** + * Get the default locale to create DateTimes with. Does not affect existing instances. + * @type {string} + */ + + }, { + key: "defaultLocale", + get: function get() { + return defaultLocale; + } + /** + * Set the default locale to create DateTimes with. Does not affect existing instances. + * @type {string} + */ + , + set: function set(locale) { + defaultLocale = locale; + } + /** + * Get the default numbering system to create DateTimes with. Does not affect existing instances. + * @type {string} + */ + + }, { + key: "defaultNumberingSystem", + get: function get() { + return defaultNumberingSystem; + } + /** + * Set the default numbering system to create DateTimes with. Does not affect existing instances. + * @type {string} + */ + , + set: function set(numberingSystem) { + defaultNumberingSystem = numberingSystem; + } + /** + * Get the default output calendar to create DateTimes with. Does not affect existing instances. + * @type {string} + */ + + }, { + key: "defaultOutputCalendar", + get: function get() { + return defaultOutputCalendar; + } + /** + * Set the default output calendar to create DateTimes with. Does not affect existing instances. + * @type {string} + */ + , + set: function set(outputCalendar) { + defaultOutputCalendar = outputCalendar; + } + /** + * Get whether Luxon will throw when it encounters invalid DateTimes, Durations, or Intervals + * @type {boolean} + */ + + }, { + key: "throwOnInvalid", + get: function get() { + return throwOnInvalid; + } + /** + * Set whether Luxon will throw when it encounters invalid DateTimes, Durations, or Intervals + * @type {boolean} + */ + , + set: function set(t) { + throwOnInvalid = t; + } + }]); + + return Settings; + }(); + + function stringifyTokens(splits, tokenToString) { + var s = ""; + + for (var _iterator = splits, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) { + var _ref; + + if (_isArray) { + if (_i >= _iterator.length) break; + _ref = _iterator[_i++]; + } else { + _i = _iterator.next(); + if (_i.done) break; + _ref = _i.value; + } + + var token = _ref; + + if (token.literal) { + s += token.val; + } else { + s += tokenToString(token.val); + } + } + + return s; + } + + var _macroTokenToFormatOpts = { + D: DATE_SHORT, + DD: DATE_MED, + DDD: DATE_FULL, + DDDD: DATE_HUGE, + t: TIME_SIMPLE, + tt: TIME_WITH_SECONDS, + ttt: TIME_WITH_SHORT_OFFSET, + tttt: TIME_WITH_LONG_OFFSET, + T: TIME_24_SIMPLE, + TT: TIME_24_WITH_SECONDS, + TTT: TIME_24_WITH_SHORT_OFFSET, + TTTT: TIME_24_WITH_LONG_OFFSET, + f: DATETIME_SHORT, + ff: DATETIME_MED, + fff: DATETIME_FULL, + ffff: DATETIME_HUGE, + F: DATETIME_SHORT_WITH_SECONDS, + FF: DATETIME_MED_WITH_SECONDS, + FFF: DATETIME_FULL_WITH_SECONDS, + FFFF: DATETIME_HUGE_WITH_SECONDS + }; + /** + * @private + */ + + var Formatter = + /*#__PURE__*/ + function () { + Formatter.create = function create(locale, opts) { + if (opts === void 0) { + opts = {}; + } + + return new Formatter(locale, opts); + }; + + Formatter.parseFormat = function parseFormat(fmt) { + var current = null, + currentFull = "", + bracketed = false; + var splits = []; + + for (var i = 0; i < fmt.length; i++) { + var c = fmt.charAt(i); + + if (c === "'") { + if (currentFull.length > 0) { + splits.push({ + literal: bracketed, + val: currentFull + }); + } + + current = null; + currentFull = ""; + bracketed = !bracketed; + } else if (bracketed) { + currentFull += c; + } else if (c === current) { + currentFull += c; + } else { + if (currentFull.length > 0) { + splits.push({ + literal: false, + val: currentFull + }); + } + + currentFull = c; + current = c; + } + } + + if (currentFull.length > 0) { + splits.push({ + literal: bracketed, + val: currentFull + }); + } + + return splits; + }; + + Formatter.macroTokenToFormatOpts = function macroTokenToFormatOpts(token) { + return _macroTokenToFormatOpts[token]; + }; + + function Formatter(locale, formatOpts) { + this.opts = formatOpts; + this.loc = locale; + this.systemLoc = null; + } + + var _proto = Formatter.prototype; + + _proto.formatWithSystemDefault = function formatWithSystemDefault(dt, opts) { + if (this.systemLoc === null) { + this.systemLoc = this.loc.redefaultToSystem(); + } + + var df = this.systemLoc.dtFormatter(dt, Object.assign({}, this.opts, opts)); + return df.format(); + }; + + _proto.formatDateTime = function formatDateTime(dt, opts) { + if (opts === void 0) { + opts = {}; + } + + var df = this.loc.dtFormatter(dt, Object.assign({}, this.opts, opts)); + return df.format(); + }; + + _proto.formatDateTimeParts = function formatDateTimeParts(dt, opts) { + if (opts === void 0) { + opts = {}; + } + + var df = this.loc.dtFormatter(dt, Object.assign({}, this.opts, opts)); + return df.formatToParts(); + }; + + _proto.resolvedOptions = function resolvedOptions(dt, opts) { + if (opts === void 0) { + opts = {}; + } + + var df = this.loc.dtFormatter(dt, Object.assign({}, this.opts, opts)); + return df.resolvedOptions(); + }; + + _proto.num = function num(n, p) { + if (p === void 0) { + p = 0; + } + + // we get some perf out of doing this here, annoyingly + if (this.opts.forceSimple) { + return padStart(n, p); + } + + var opts = Object.assign({}, this.opts); + + if (p > 0) { + opts.padTo = p; + } + + return this.loc.numberFormatter(opts).format(n); + }; + + _proto.formatDateTimeFromString = function formatDateTimeFromString(dt, fmt) { + var _this = this; + + var knownEnglish = this.loc.listingMode() === "en", + useDateTimeFormatter = this.loc.outputCalendar && this.loc.outputCalendar !== "gregory" && hasFormatToParts(), + string = function string(opts, extract) { + return _this.loc.extract(dt, opts, extract); + }, + formatOffset = function formatOffset(opts) { + if (dt.isOffsetFixed && dt.offset === 0 && opts.allowZ) { + return "Z"; + } + + return dt.isValid ? dt.zone.formatOffset(dt.ts, opts.format) : ""; + }, + meridiem = function meridiem() { + return knownEnglish ? meridiemForDateTime(dt) : string({ + hour: "numeric", + hour12: true + }, "dayperiod"); + }, + month = function month(length, standalone) { + return knownEnglish ? monthForDateTime(dt, length) : string(standalone ? { + month: length + } : { + month: length, + day: "numeric" + }, "month"); + }, + weekday = function weekday(length, standalone) { + return knownEnglish ? weekdayForDateTime(dt, length) : string(standalone ? { + weekday: length + } : { + weekday: length, + month: "long", + day: "numeric" + }, "weekday"); + }, + maybeMacro = function maybeMacro(token) { + var formatOpts = Formatter.macroTokenToFormatOpts(token); + + if (formatOpts) { + return _this.formatWithSystemDefault(dt, formatOpts); + } else { + return token; + } + }, + era = function era(length) { + return knownEnglish ? eraForDateTime(dt, length) : string({ + era: length + }, "era"); + }, + tokenToString = function tokenToString(token) { + // Where possible: http://cldr.unicode.org/translation/date-time#TOC-Stand-Alone-vs.-Format-Styles + switch (token) { + // ms + case "S": + return _this.num(dt.millisecond); + + case "u": // falls through + + case "SSS": + return _this.num(dt.millisecond, 3); + // seconds + + case "s": + return _this.num(dt.second); + + case "ss": + return _this.num(dt.second, 2); + // minutes + + case "m": + return _this.num(dt.minute); + + case "mm": + return _this.num(dt.minute, 2); + // hours + + case "h": + return _this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12); + + case "hh": + return _this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12, 2); + + case "H": + return _this.num(dt.hour); + + case "HH": + return _this.num(dt.hour, 2); + // offset + + case "Z": + // like +6 + return formatOffset({ + format: "narrow", + allowZ: _this.opts.allowZ + }); + + case "ZZ": + // like +06:00 + return formatOffset({ + format: "short", + allowZ: _this.opts.allowZ + }); + + case "ZZZ": + // like +0600 + return formatOffset({ + format: "techie", + allowZ: false + }); + + case "ZZZZ": + // like EST + return dt.zone.offsetName(dt.ts, { + format: "short", + locale: _this.loc.locale + }); + + case "ZZZZZ": + // like Eastern Standard Time + return dt.zone.offsetName(dt.ts, { + format: "long", + locale: _this.loc.locale + }); + // zone + + case "z": + // like America/New_York + return dt.zoneName; + // meridiems + + case "a": + return meridiem(); + // dates + + case "d": + return useDateTimeFormatter ? string({ + day: "numeric" + }, "day") : _this.num(dt.day); + + case "dd": + return useDateTimeFormatter ? string({ + day: "2-digit" + }, "day") : _this.num(dt.day, 2); + // weekdays - standalone + + case "c": + // like 1 + return _this.num(dt.weekday); + + case "ccc": + // like 'Tues' + return weekday("short", true); + + case "cccc": + // like 'Tuesday' + return weekday("long", true); + + case "ccccc": + // like 'T' + return weekday("narrow", true); + // weekdays - format + + case "E": + // like 1 + return _this.num(dt.weekday); + + case "EEE": + // like 'Tues' + return weekday("short", false); + + case "EEEE": + // like 'Tuesday' + return weekday("long", false); + + case "EEEEE": + // like 'T' + return weekday("narrow", false); + // months - standalone + + case "L": + // like 1 + return useDateTimeFormatter ? string({ + month: "numeric", + day: "numeric" + }, "month") : _this.num(dt.month); + + case "LL": + // like 01, doesn't seem to work + return useDateTimeFormatter ? string({ + month: "2-digit", + day: "numeric" + }, "month") : _this.num(dt.month, 2); + + case "LLL": + // like Jan + return month("short", true); + + case "LLLL": + // like January + return month("long", true); + + case "LLLLL": + // like J + return month("narrow", true); + // months - format + + case "M": + // like 1 + return useDateTimeFormatter ? string({ + month: "numeric" + }, "month") : _this.num(dt.month); + + case "MM": + // like 01 + return useDateTimeFormatter ? string({ + month: "2-digit" + }, "month") : _this.num(dt.month, 2); + + case "MMM": + // like Jan + return month("short", false); + + case "MMMM": + // like January + return month("long", false); + + case "MMMMM": + // like J + return month("narrow", false); + // years + + case "y": + // like 2014 + return useDateTimeFormatter ? string({ + year: "numeric" + }, "year") : _this.num(dt.year); + + case "yy": + // like 14 + return useDateTimeFormatter ? string({ + year: "2-digit" + }, "year") : _this.num(dt.year.toString().slice(-2), 2); + + case "yyyy": + // like 0012 + return useDateTimeFormatter ? string({ + year: "numeric" + }, "year") : _this.num(dt.year, 4); + + case "yyyyyy": + // like 000012 + return useDateTimeFormatter ? string({ + year: "numeric" + }, "year") : _this.num(dt.year, 6); + // eras + + case "G": + // like AD + return era("short"); + + case "GG": + // like Anno Domini + return era("long"); + + case "GGGGG": + return era("narrow"); + + case "kk": + return _this.num(dt.weekYear.toString().slice(-2), 2); + + case "kkkk": + return _this.num(dt.weekYear, 4); + + case "W": + return _this.num(dt.weekNumber); + + case "WW": + return _this.num(dt.weekNumber, 2); + + case "o": + return _this.num(dt.ordinal); + + case "ooo": + return _this.num(dt.ordinal, 3); + + case "q": + // like 1 + return _this.num(dt.quarter); + + case "qq": + // like 01 + return _this.num(dt.quarter, 2); + + case "X": + return _this.num(Math.floor(dt.ts / 1000)); + + case "x": + return _this.num(dt.ts); + + default: + return maybeMacro(token); + } + }; + + return stringifyTokens(Formatter.parseFormat(fmt), tokenToString); + }; + + _proto.formatDurationFromString = function formatDurationFromString(dur, fmt) { + var _this2 = this; + + var tokenToField = function tokenToField(token) { + switch (token[0]) { + case "S": + return "millisecond"; + + case "s": + return "second"; + + case "m": + return "minute"; + + case "h": + return "hour"; + + case "d": + return "day"; + + case "M": + return "month"; + + case "y": + return "year"; + + default: + return null; + } + }, + tokenToString = function tokenToString(lildur) { + return function (token) { + var mapped = tokenToField(token); + + if (mapped) { + return _this2.num(lildur.get(mapped), token.length); + } else { + return token; + } + }; + }, + tokens = Formatter.parseFormat(fmt), + realTokens = tokens.reduce(function (found, _ref2) { + var literal = _ref2.literal, + val = _ref2.val; + return literal ? found : found.concat(val); + }, []), + collapsed = dur.shiftTo.apply(dur, realTokens.map(tokenToField).filter(function (t) { + return t; + })); + + return stringifyTokens(tokens, tokenToString(collapsed)); + }; + + return Formatter; + }(); + + var intlDTCache = {}; + + function getCachedDTF(locString, opts) { + if (opts === void 0) { + opts = {}; + } + + var key = JSON.stringify([locString, opts]); + var dtf = intlDTCache[key]; + + if (!dtf) { + dtf = new Intl.DateTimeFormat(locString, opts); + intlDTCache[key] = dtf; + } + + return dtf; + } + + var intlNumCache = {}; + + function getCachendINF(locString, opts) { + if (opts === void 0) { + opts = {}; + } + + var key = JSON.stringify([locString, opts]); + var inf = intlNumCache[key]; + + if (!inf) { + inf = new Intl.NumberFormat(locString, opts); + intlNumCache[key] = inf; + } + + return inf; + } + + var intlRelCache = {}; + + function getCachendRTF(locString, opts) { + if (opts === void 0) { + opts = {}; + } + + var key = JSON.stringify([locString, opts]); + var inf = intlRelCache[key]; + + if (!inf) { + inf = new Intl.RelativeTimeFormat(locString, opts); + intlRelCache[key] = inf; + } + + return inf; + } + + var sysLocaleCache = null; + + function systemLocale() { + if (sysLocaleCache) { + return sysLocaleCache; + } else if (hasIntl()) { + var computedSys = new Intl.DateTimeFormat().resolvedOptions().locale; // node sometimes defaults to "und". Override that because that is dumb + + sysLocaleCache = !computedSys || computedSys === "und" ? "en-US" : computedSys; + return sysLocaleCache; + } else { + sysLocaleCache = "en-US"; + return sysLocaleCache; + } + } + + function parseLocaleString(localeStr) { + // I really want to avoid writing a BCP 47 parser + // see, e.g. https://github.com/wooorm/bcp-47 + // Instead, we'll do this: + // a) if the string has no -u extensions, just leave it alone + // b) if it does, use Intl to resolve everything + // c) if Intl fails, try again without the -u + var uIndex = localeStr.indexOf("-u-"); + + if (uIndex === -1) { + return [localeStr]; + } else { + var options; + var smaller = localeStr.substring(0, uIndex); + + try { + options = getCachedDTF(localeStr).resolvedOptions(); + } catch (e) { + options = getCachedDTF(smaller).resolvedOptions(); + } + + var _options = options, + numberingSystem = _options.numberingSystem, + calendar = _options.calendar; // return the smaller one so that we can append the calendar and numbering overrides to it + + return [smaller, numberingSystem, calendar]; + } + } + + function intlConfigString(localeStr, numberingSystem, outputCalendar) { + if (hasIntl()) { + if (outputCalendar || numberingSystem) { + localeStr += "-u"; + + if (outputCalendar) { + localeStr += "-ca-" + outputCalendar; + } + + if (numberingSystem) { + localeStr += "-nu-" + numberingSystem; + } + + return localeStr; + } else { + return localeStr; + } + } else { + return []; + } + } + + function mapMonths(f) { + var ms = []; + + for (var i = 1; i <= 12; i++) { + var dt = DateTime.utc(2016, i, 1); + ms.push(f(dt)); + } + + return ms; + } + + function mapWeekdays(f) { + var ms = []; + + for (var i = 1; i <= 7; i++) { + var dt = DateTime.utc(2016, 11, 13 + i); + ms.push(f(dt)); + } + + return ms; + } + + function listStuff(loc, length, defaultOK, englishFn, intlFn) { + var mode = loc.listingMode(defaultOK); + + if (mode === "error") { + return null; + } else if (mode === "en") { + return englishFn(length); + } else { + return intlFn(length); + } + } + + function supportsFastNumbers(loc) { + if (loc.numberingSystem && loc.numberingSystem !== "latn") { + return false; + } else { + return loc.numberingSystem === "latn" || !loc.locale || loc.locale.startsWith("en") || hasIntl() && new Intl.DateTimeFormat(loc.intl).resolvedOptions().numberingSystem === "latn"; + } + } + /** + * @private + */ + + + var PolyNumberFormatter = + /*#__PURE__*/ + function () { + function PolyNumberFormatter(intl, forceSimple, opts) { + this.padTo = opts.padTo || 0; + this.floor = opts.floor || false; + + if (!forceSimple && hasIntl()) { + var intlOpts = { + useGrouping: false + }; + if (opts.padTo > 0) intlOpts.minimumIntegerDigits = opts.padTo; + this.inf = getCachendINF(intl, intlOpts); + } + } + + var _proto = PolyNumberFormatter.prototype; + + _proto.format = function format(i) { + if (this.inf) { + var fixed = this.floor ? Math.floor(i) : i; + return this.inf.format(fixed); + } else { + // to match the browser's numberformatter defaults + var _fixed = this.floor ? Math.floor(i) : roundTo(i, 3); + + return padStart(_fixed, this.padTo); + } + }; + + return PolyNumberFormatter; + }(); + /** + * @private + */ + + + var PolyDateFormatter = + /*#__PURE__*/ + function () { + function PolyDateFormatter(dt, intl, opts) { + this.opts = opts; + this.hasIntl = hasIntl(); + var z; + + if (dt.zone.universal && this.hasIntl) { + // Chromium doesn't support fixed-offset zones like Etc/GMT+8 in its formatter, + // See https://bugs.chromium.org/p/chromium/issues/detail?id=364374. + // So we have to make do. Two cases: + // 1. The format options tell us to show the zone. We can't do that, so the best + // we can do is format the date in UTC. + // 2. The format options don't tell us to show the zone. Then we can adjust them + // the time and tell the formatter to show it to us in UTC, so that the time is right + // and the bad zone doesn't show up. + // We can clean all this up when Chrome fixes this. + z = "UTC"; + + if (opts.timeZoneName) { + this.dt = dt; + } else { + this.dt = dt.offset === 0 ? dt : DateTime.fromMillis(dt.ts + dt.offset * 60 * 1000); + } + } else if (dt.zone.type === "local") { + this.dt = dt; + } else { + this.dt = dt; + z = dt.zone.name; + } + + if (this.hasIntl) { + var intlOpts = Object.assign({}, this.opts); + + if (z) { + intlOpts.timeZone = z; + } + + this.dtf = getCachedDTF(intl, intlOpts); + } + } + + var _proto2 = PolyDateFormatter.prototype; + + _proto2.format = function format() { + if (this.hasIntl) { + return this.dtf.format(this.dt.toJSDate()); + } else { + var tokenFormat = formatString(this.opts), + loc = Locale.create("en-US"); + return Formatter.create(loc).formatDateTimeFromString(this.dt, tokenFormat); + } + }; + + _proto2.formatToParts = function formatToParts() { + if (this.hasIntl && hasFormatToParts()) { + return this.dtf.formatToParts(this.dt.toJSDate()); + } else { + // This is kind of a cop out. We actually could do this for English. However, we couldn't do it for intl strings + // and IMO it's too weird to have an uncanny valley like that + return []; + } + }; + + _proto2.resolvedOptions = function resolvedOptions() { + if (this.hasIntl) { + return this.dtf.resolvedOptions(); + } else { + return { + locale: "en-US", + numberingSystem: "latn", + outputCalendar: "gregory" + }; + } + }; + + return PolyDateFormatter; + }(); + /** + * @private + */ + + + var PolyRelFormatter = + /*#__PURE__*/ + function () { + function PolyRelFormatter(intl, isEnglish, opts) { + this.opts = Object.assign({ + style: "long" + }, opts); + + if (!isEnglish && hasRelative()) { + this.rtf = getCachendRTF(intl, opts); + } + } + + var _proto3 = PolyRelFormatter.prototype; + + _proto3.format = function format(count, unit) { + if (this.rtf) { + return this.rtf.format(count, unit); + } else { + return formatRelativeTime(unit, count, this.opts.numeric, this.opts.style !== "long"); + } + }; + + _proto3.formatToParts = function formatToParts(count, unit) { + if (this.rtf) { + return this.rtf.formatToParts(count, unit); + } else { + return []; + } + }; + + return PolyRelFormatter; + }(); + /** + * @private + */ + + + var Locale = + /*#__PURE__*/ + function () { + Locale.fromOpts = function fromOpts(opts) { + return Locale.create(opts.locale, opts.numberingSystem, opts.outputCalendar, opts.defaultToEN); + }; + + Locale.create = function create(locale, numberingSystem, outputCalendar, defaultToEN) { + if (defaultToEN === void 0) { + defaultToEN = false; + } + + var specifiedLocale = locale || Settings.defaultLocale, + // the system locale is useful for human readable strings but annoying for parsing/formatting known formats + localeR = specifiedLocale || (defaultToEN ? "en-US" : systemLocale()), + numberingSystemR = numberingSystem || Settings.defaultNumberingSystem, + outputCalendarR = outputCalendar || Settings.defaultOutputCalendar; + return new Locale(localeR, numberingSystemR, outputCalendarR, specifiedLocale); + }; + + Locale.resetCache = function resetCache() { + sysLocaleCache = null; + intlDTCache = {}; + intlNumCache = {}; + intlRelCache = {}; + }; + + Locale.fromObject = function fromObject(_temp) { + var _ref = _temp === void 0 ? {} : _temp, + locale = _ref.locale, + numberingSystem = _ref.numberingSystem, + outputCalendar = _ref.outputCalendar; + + return Locale.create(locale, numberingSystem, outputCalendar); + }; + + function Locale(locale, numbering, outputCalendar, specifiedLocale) { + var _parseLocaleString = parseLocaleString(locale), + parsedLocale = _parseLocaleString[0], + parsedNumberingSystem = _parseLocaleString[1], + parsedOutputCalendar = _parseLocaleString[2]; + + this.locale = parsedLocale; + this.numberingSystem = numbering || parsedNumberingSystem || null; + this.outputCalendar = outputCalendar || parsedOutputCalendar || null; + this.intl = intlConfigString(this.locale, this.numberingSystem, this.outputCalendar); + this.weekdaysCache = { + format: {}, + standalone: {} + }; + this.monthsCache = { + format: {}, + standalone: {} + }; + this.meridiemCache = null; + this.eraCache = {}; + this.specifiedLocale = specifiedLocale; + this.fastNumbersCached = null; + } + + var _proto4 = Locale.prototype; + + _proto4.listingMode = function listingMode(defaultOK) { + if (defaultOK === void 0) { + defaultOK = true; + } + + var intl = hasIntl(), + hasFTP = intl && hasFormatToParts(), + isActuallyEn = this.isEnglish(), + hasNoWeirdness = (this.numberingSystem === null || this.numberingSystem === "latn") && (this.outputCalendar === null || this.outputCalendar === "gregory"); + + if (!hasFTP && !(isActuallyEn && hasNoWeirdness) && !defaultOK) { + return "error"; + } else if (!hasFTP || isActuallyEn && hasNoWeirdness) { + return "en"; + } else { + return "intl"; + } + }; + + _proto4.clone = function clone(alts) { + if (!alts || Object.getOwnPropertyNames(alts).length === 0) { + return this; + } else { + return Locale.create(alts.locale || this.specifiedLocale, alts.numberingSystem || this.numberingSystem, alts.outputCalendar || this.outputCalendar, alts.defaultToEN || false); + } + }; + + _proto4.redefaultToEN = function redefaultToEN(alts) { + if (alts === void 0) { + alts = {}; + } + + return this.clone(Object.assign({}, alts, { + defaultToEN: true + })); + }; + + _proto4.redefaultToSystem = function redefaultToSystem(alts) { + if (alts === void 0) { + alts = {}; + } + + return this.clone(Object.assign({}, alts, { + defaultToEN: false + })); + }; + + _proto4.months = function months$1(length, format, defaultOK) { + var _this = this; + + if (format === void 0) { + format = false; + } + + if (defaultOK === void 0) { + defaultOK = true; + } + + return listStuff(this, length, defaultOK, months, function () { + var intl = format ? { + month: length, + day: "numeric" + } : { + month: length + }, + formatStr = format ? "format" : "standalone"; + + if (!_this.monthsCache[formatStr][length]) { + _this.monthsCache[formatStr][length] = mapMonths(function (dt) { + return _this.extract(dt, intl, "month"); + }); + } + + return _this.monthsCache[formatStr][length]; + }); + }; + + _proto4.weekdays = function weekdays$1(length, format, defaultOK) { + var _this2 = this; + + if (format === void 0) { + format = false; + } + + if (defaultOK === void 0) { + defaultOK = true; + } + + return listStuff(this, length, defaultOK, weekdays, function () { + var intl = format ? { + weekday: length, + year: "numeric", + month: "long", + day: "numeric" + } : { + weekday: length + }, + formatStr = format ? "format" : "standalone"; + + if (!_this2.weekdaysCache[formatStr][length]) { + _this2.weekdaysCache[formatStr][length] = mapWeekdays(function (dt) { + return _this2.extract(dt, intl, "weekday"); + }); + } + + return _this2.weekdaysCache[formatStr][length]; + }); + }; + + _proto4.meridiems = function meridiems$1(defaultOK) { + var _this3 = this; + + if (defaultOK === void 0) { + defaultOK = true; + } + + return listStuff(this, undefined, defaultOK, function () { + return meridiems; + }, function () { + // In theory there could be aribitrary day periods. We're gonna assume there are exactly two + // for AM and PM. This is probably wrong, but it's makes parsing way easier. + if (!_this3.meridiemCache) { + var intl = { + hour: "numeric", + hour12: true + }; + _this3.meridiemCache = [DateTime.utc(2016, 11, 13, 9), DateTime.utc(2016, 11, 13, 19)].map(function (dt) { + return _this3.extract(dt, intl, "dayperiod"); + }); + } + + return _this3.meridiemCache; + }); + }; + + _proto4.eras = function eras$1(length, defaultOK) { + var _this4 = this; + + if (defaultOK === void 0) { + defaultOK = true; + } + + return listStuff(this, length, defaultOK, eras, function () { + var intl = { + era: length + }; // This is utter bullshit. Different calendars are going to define eras totally differently. What I need is the minimum set of dates + // to definitely enumerate them. + + if (!_this4.eraCache[length]) { + _this4.eraCache[length] = [DateTime.utc(-40, 1, 1), DateTime.utc(2017, 1, 1)].map(function (dt) { + return _this4.extract(dt, intl, "era"); + }); + } + + return _this4.eraCache[length]; + }); + }; + + _proto4.extract = function extract(dt, intlOpts, field) { + var df = this.dtFormatter(dt, intlOpts), + results = df.formatToParts(), + matching = results.find(function (m) { + return m.type.toLowerCase() === field; + }); + return matching ? matching.value : null; + }; + + _proto4.numberFormatter = function numberFormatter(opts) { + if (opts === void 0) { + opts = {}; + } + + // this forcesimple option is never used (the only caller short-circuits on it, but it seems safer to leave) + // (in contrast, the rest of the condition is used heavily) + return new PolyNumberFormatter(this.intl, opts.forceSimple || this.fastNumbers, opts); + }; + + _proto4.dtFormatter = function dtFormatter(dt, intlOpts) { + if (intlOpts === void 0) { + intlOpts = {}; + } + + return new PolyDateFormatter(dt, this.intl, intlOpts); + }; + + _proto4.relFormatter = function relFormatter(opts) { + if (opts === void 0) { + opts = {}; + } + + return new PolyRelFormatter(this.intl, this.isEnglish(), opts); + }; + + _proto4.isEnglish = function isEnglish() { + return this.locale === "en" || this.locale.toLowerCase() === "en-us" || hasIntl() && new Intl.DateTimeFormat(this.intl).resolvedOptions().locale.startsWith("en-us"); + }; + + _proto4.equals = function equals(other) { + return this.locale === other.locale && this.numberingSystem === other.numberingSystem && this.outputCalendar === other.outputCalendar; + }; + + _createClass(Locale, [{ + key: "fastNumbers", + get: function get() { + if (this.fastNumbersCached == null) { + this.fastNumbersCached = supportsFastNumbers(this); + } + + return this.fastNumbersCached; + } + }]); + + return Locale; + }(); + + /* + * This file handles parsing for well-specified formats. Here's how it works: + * Two things go into parsing: a regex to match with and an extractor to take apart the groups in the match. + * An extractor is just a function that takes a regex match array and returns a { year: ..., month: ... } object + * parse() does the work of executing the regex and applying the extractor. It takes multiple regex/extractor pairs to try in sequence. + * Extractors can take a "cursor" representing the offset in the match to look at. This makes it easy to combine extractors. + * combineExtractors() does the work of combining them, keeping track of the cursor through multiple extractions. + * Some extractions are super dumb and simpleParse and fromStrings help DRY them. + */ + + function combineRegexes() { + for (var _len = arguments.length, regexes = new Array(_len), _key = 0; _key < _len; _key++) { + regexes[_key] = arguments[_key]; + } + + var full = regexes.reduce(function (f, r) { + return f + r.source; + }, ""); + return RegExp("^" + full + "$"); + } + + function combineExtractors() { + for (var _len2 = arguments.length, extractors = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + extractors[_key2] = arguments[_key2]; + } + + return function (m) { + return extractors.reduce(function (_ref, ex) { + var mergedVals = _ref[0], + mergedZone = _ref[1], + cursor = _ref[2]; + + var _ex = ex(m, cursor), + val = _ex[0], + zone = _ex[1], + next = _ex[2]; + + return [Object.assign(mergedVals, val), mergedZone || zone, next]; + }, [{}, null, 1]).slice(0, 2); + }; + } + + function parse(s) { + if (s == null) { + return [null, null]; + } + + for (var _len3 = arguments.length, patterns = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) { + patterns[_key3 - 1] = arguments[_key3]; + } + + for (var _i = 0, _patterns = patterns; _i < _patterns.length; _i++) { + var _patterns$_i = _patterns[_i], + regex = _patterns$_i[0], + extractor = _patterns$_i[1]; + var m = regex.exec(s); + + if (m) { + return extractor(m); + } + } + + return [null, null]; + } + + function simpleParse() { + for (var _len4 = arguments.length, keys = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) { + keys[_key4] = arguments[_key4]; + } + + return function (match, cursor) { + var ret = {}; + var i; + + for (i = 0; i < keys.length; i++) { + ret[keys[i]] = parseInteger(match[cursor + i]); + } + + return [ret, null, cursor + i]; + }; + } // ISO and SQL parsing + + + var offsetRegex = /(?:(Z)|([+-]\d\d)(?::?(\d\d))?)/, + isoTimeBaseRegex = /(\d\d)(?::?(\d\d)(?::?(\d\d)(?:[.,](\d{1,9}))?)?)?/, + isoTimeRegex = RegExp("" + isoTimeBaseRegex.source + offsetRegex.source + "?"), + isoTimeExtensionRegex = RegExp("(?:T" + isoTimeRegex.source + ")?"), + isoYmdRegex = /([+-]\d{6}|\d{4})(?:-?(\d\d)(?:-?(\d\d))?)?/, + isoWeekRegex = /(\d{4})-?W(\d\d)(?:-?(\d))?/, + isoOrdinalRegex = /(\d{4})-?(\d{3})/, + extractISOWeekData = simpleParse("weekYear", "weekNumber", "weekDay"), + extractISOOrdinalData = simpleParse("year", "ordinal"), + sqlYmdRegex = /(\d{4})-(\d\d)-(\d\d)/, + // dumbed-down version of the ISO one + sqlTimeRegex = RegExp(isoTimeBaseRegex.source + " ?(?:" + offsetRegex.source + "|(" + ianaRegex.source + "))?"), + sqlTimeExtensionRegex = RegExp("(?: " + sqlTimeRegex.source + ")?"); + + function int(match, pos, fallback) { + var m = match[pos]; + return isUndefined(m) ? fallback : parseInteger(m); + } + + function extractISOYmd(match, cursor) { + var item = { + year: int(match, cursor), + month: int(match, cursor + 1, 1), + day: int(match, cursor + 2, 1) + }; + return [item, null, cursor + 3]; + } + + function extractISOTime(match, cursor) { + var item = { + hour: int(match, cursor, 0), + minute: int(match, cursor + 1, 0), + second: int(match, cursor + 2, 0), + millisecond: parseMillis(match[cursor + 3]) + }; + return [item, null, cursor + 4]; + } + + function extractISOOffset(match, cursor) { + var local = !match[cursor] && !match[cursor + 1], + fullOffset = signedOffset(match[cursor + 1], match[cursor + 2]), + zone = local ? null : FixedOffsetZone.instance(fullOffset); + return [{}, zone, cursor + 3]; + } + + function extractIANAZone(match, cursor) { + var zone = match[cursor] ? IANAZone.create(match[cursor]) : null; + return [{}, zone, cursor + 1]; + } // ISO duration parsing + + + var isoDuration = /^P(?:(?:(-?\d{1,9})Y)?(?:(-?\d{1,9})M)?(?:(-?\d{1,9})W)?(?:(-?\d{1,9})D)?(?:T(?:(-?\d{1,9})H)?(?:(-?\d{1,9})M)?(?:(-?\d{1,9})(?:[.,](-?\d{1,9}))?S)?)?)$/; + + function extractISODuration(match) { + var yearStr = match[1], + monthStr = match[2], + weekStr = match[3], + dayStr = match[4], + hourStr = match[5], + minuteStr = match[6], + secondStr = match[7], + millisecondsStr = match[8]; + return [{ + years: parseInteger(yearStr), + months: parseInteger(monthStr), + weeks: parseInteger(weekStr), + days: parseInteger(dayStr), + hours: parseInteger(hourStr), + minutes: parseInteger(minuteStr), + seconds: parseInteger(secondStr), + milliseconds: parseMillis(millisecondsStr) + }]; + } // These are a little braindead. EDT *should* tell us that we're in, say, America/New_York + // and not just that we're in -240 *right now*. But since I don't think these are used that often + // I'm just going to ignore that + + + var obsOffsets = { + GMT: 0, + EDT: -4 * 60, + EST: -5 * 60, + CDT: -5 * 60, + CST: -6 * 60, + MDT: -6 * 60, + MST: -7 * 60, + PDT: -7 * 60, + PST: -8 * 60 + }; + + function fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) { + var result = { + year: yearStr.length === 2 ? untruncateYear(parseInteger(yearStr)) : parseInteger(yearStr), + month: monthsShort.indexOf(monthStr) + 1, + day: parseInteger(dayStr), + hour: parseInteger(hourStr), + minute: parseInteger(minuteStr) + }; + if (secondStr) result.second = parseInteger(secondStr); + + if (weekdayStr) { + result.weekday = weekdayStr.length > 3 ? weekdaysLong.indexOf(weekdayStr) + 1 : weekdaysShort.indexOf(weekdayStr) + 1; + } + + return result; + } // RFC 2822/5322 + + + var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|(?:([+-]\d\d)(\d\d)))$/; + + function extractRFC2822(match) { + var weekdayStr = match[1], + dayStr = match[2], + monthStr = match[3], + yearStr = match[4], + hourStr = match[5], + minuteStr = match[6], + secondStr = match[7], + obsOffset = match[8], + milOffset = match[9], + offHourStr = match[10], + offMinuteStr = match[11], + result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr); + var offset; + + if (obsOffset) { + offset = obsOffsets[obsOffset]; + } else if (milOffset) { + offset = 0; + } else { + offset = signedOffset(offHourStr, offMinuteStr); + } + + return [result, new FixedOffsetZone(offset)]; + } + + function preprocessRFC2822(s) { + // Remove comments and folding whitespace and replace multiple-spaces with a single space + return s.replace(/\([^)]*\)|[\n\t]/g, " ").replace(/(\s\s+)/g, " ").trim(); + } // http date + + + var rfc1123 = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun), (\d\d) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\d{4}) (\d\d):(\d\d):(\d\d) GMT$/, + rfc850 = /^(Monday|Tuesday|Wedsday|Thursday|Friday|Saturday|Sunday), (\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d) (\d\d):(\d\d):(\d\d) GMT$/, + ascii = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ( \d|\d\d) (\d\d):(\d\d):(\d\d) (\d{4})$/; + + function extractRFC1123Or850(match) { + var weekdayStr = match[1], + dayStr = match[2], + monthStr = match[3], + yearStr = match[4], + hourStr = match[5], + minuteStr = match[6], + secondStr = match[7], + result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr); + return [result, FixedOffsetZone.utcInstance]; + } + + function extractASCII(match) { + var weekdayStr = match[1], + monthStr = match[2], + dayStr = match[3], + hourStr = match[4], + minuteStr = match[5], + secondStr = match[6], + yearStr = match[7], + result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr); + return [result, FixedOffsetZone.utcInstance]; + } + + var isoYmdWithTimeExtensionRegex = combineRegexes(isoYmdRegex, isoTimeExtensionRegex); + var isoWeekWithTimeExtensionRegex = combineRegexes(isoWeekRegex, isoTimeExtensionRegex); + var isoOrdinalWithTimeExtensionRegex = combineRegexes(isoOrdinalRegex, isoTimeExtensionRegex); + var isoTimeCombinedRegex = combineRegexes(isoTimeRegex); + var extractISOYmdTimeAndOffset = combineExtractors(extractISOYmd, extractISOTime, extractISOOffset); + var extractISOWeekTimeAndOffset = combineExtractors(extractISOWeekData, extractISOTime, extractISOOffset); + var extractISOOrdinalDataAndTime = combineExtractors(extractISOOrdinalData, extractISOTime); + var extractISOTimeAndOffset = combineExtractors(extractISOTime, extractISOOffset); + /** + * @private + */ + + function parseISODate(s) { + return parse(s, [isoYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset], [isoWeekWithTimeExtensionRegex, extractISOWeekTimeAndOffset], [isoOrdinalWithTimeExtensionRegex, extractISOOrdinalDataAndTime], [isoTimeCombinedRegex, extractISOTimeAndOffset]); + } + function parseRFC2822Date(s) { + return parse(preprocessRFC2822(s), [rfc2822, extractRFC2822]); + } + function parseHTTPDate(s) { + return parse(s, [rfc1123, extractRFC1123Or850], [rfc850, extractRFC1123Or850], [ascii, extractASCII]); + } + function parseISODuration(s) { + return parse(s, [isoDuration, extractISODuration]); + } + var sqlYmdWithTimeExtensionRegex = combineRegexes(sqlYmdRegex, sqlTimeExtensionRegex); + var sqlTimeCombinedRegex = combineRegexes(sqlTimeRegex); + var extractISOYmdTimeOffsetAndIANAZone = combineExtractors(extractISOYmd, extractISOTime, extractISOOffset, extractIANAZone); + var extractISOTimeOffsetAndIANAZone = combineExtractors(extractISOTime, extractISOOffset, extractIANAZone); + function parseSQL(s) { + return parse(s, [sqlYmdWithTimeExtensionRegex, extractISOYmdTimeOffsetAndIANAZone], [sqlTimeCombinedRegex, extractISOTimeOffsetAndIANAZone]); + } + + var Invalid = + /*#__PURE__*/ + function () { + function Invalid(reason, explanation) { + this.reason = reason; + this.explanation = explanation; + } + + var _proto = Invalid.prototype; + + _proto.toMessage = function toMessage() { + if (this.explanation) { + return this.reason + ": " + this.explanation; + } else { + return this.reason; + } + }; + + return Invalid; + }(); + + var INVALID = "Invalid Duration"; // unit conversion constants + + var lowOrderMatrix = { + weeks: { + days: 7, + hours: 7 * 24, + minutes: 7 * 24 * 60, + seconds: 7 * 24 * 60 * 60, + milliseconds: 7 * 24 * 60 * 60 * 1000 + }, + days: { + hours: 24, + minutes: 24 * 60, + seconds: 24 * 60 * 60, + milliseconds: 24 * 60 * 60 * 1000 + }, + hours: { + minutes: 60, + seconds: 60 * 60, + milliseconds: 60 * 60 * 1000 + }, + minutes: { + seconds: 60, + milliseconds: 60 * 1000 + }, + seconds: { + milliseconds: 1000 + } + }, + casualMatrix = Object.assign({ + years: { + months: 12, + weeks: 52, + days: 365, + hours: 365 * 24, + minutes: 365 * 24 * 60, + seconds: 365 * 24 * 60 * 60, + milliseconds: 365 * 24 * 60 * 60 * 1000 + }, + quarters: { + months: 3, + weeks: 13, + days: 91, + hours: 91 * 24, + minutes: 91 * 24 * 60, + milliseconds: 91 * 24 * 60 * 60 * 1000 + }, + months: { + weeks: 4, + days: 30, + hours: 30 * 24, + minutes: 30 * 24 * 60, + seconds: 30 * 24 * 60 * 60, + milliseconds: 30 * 24 * 60 * 60 * 1000 + } + }, lowOrderMatrix), + daysInYearAccurate = 146097.0 / 400, + daysInMonthAccurate = 146097.0 / 4800, + accurateMatrix = Object.assign({ + years: { + months: 12, + weeks: daysInYearAccurate / 7, + days: daysInYearAccurate, + hours: daysInYearAccurate * 24, + minutes: daysInYearAccurate * 24 * 60, + seconds: daysInYearAccurate * 24 * 60 * 60, + milliseconds: daysInYearAccurate * 24 * 60 * 60 * 1000 + }, + quarters: { + months: 3, + weeks: daysInYearAccurate / 28, + days: daysInYearAccurate / 4, + hours: daysInYearAccurate * 24 / 4, + minutes: daysInYearAccurate * 24 * 60 / 4, + seconds: daysInYearAccurate * 24 * 60 * 60 / 4, + milliseconds: daysInYearAccurate * 24 * 60 * 60 * 1000 / 4 + }, + months: { + weeks: daysInMonthAccurate / 7, + days: daysInMonthAccurate, + hours: daysInMonthAccurate * 24, + minutes: daysInMonthAccurate * 24 * 60, + seconds: daysInMonthAccurate * 24 * 60 * 60, + milliseconds: daysInMonthAccurate * 24 * 60 * 60 * 1000 + } + }, lowOrderMatrix); // units ordered by size + + var orderedUnits = ["years", "quarters", "months", "weeks", "days", "hours", "minutes", "seconds", "milliseconds"]; + var reverseUnits = orderedUnits.slice(0).reverse(); // clone really means "create another instance just like this one, but with these changes" + + function clone(dur, alts, clear) { + if (clear === void 0) { + clear = false; + } + + // deep merge for vals + var conf = { + values: clear ? alts.values : Object.assign({}, dur.values, alts.values || {}), + loc: dur.loc.clone(alts.loc), + conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy + }; + return new Duration(conf); + } + + function antiTrunc(n) { + return n < 0 ? Math.floor(n) : Math.ceil(n); + } // NB: mutates parameters + + + function convert(matrix, fromMap, fromUnit, toMap, toUnit) { + var conv = matrix[toUnit][fromUnit], + raw = fromMap[fromUnit] / conv, + sameSign = Math.sign(raw) === Math.sign(toMap[toUnit]), + // ok, so this is wild, but see the matrix in the tests + added = !sameSign && toMap[toUnit] !== 0 && Math.abs(raw) <= 1 ? antiTrunc(raw) : Math.trunc(raw); + toMap[toUnit] += added; + fromMap[fromUnit] -= added * conv; + } // NB: mutates parameters + + + function normalizeValues(matrix, vals) { + reverseUnits.reduce(function (previous, current) { + if (!isUndefined(vals[current])) { + if (previous) { + convert(matrix, vals, previous, vals, current); + } + + return current; + } else { + return previous; + } + }, null); + } + /** + * A Duration object represents a period of time, like "2 months" or "1 day, 1 hour". Conceptually, it's just a map of units to their quantities, accompanied by some additional configuration and methods for creating, parsing, interrogating, transforming, and formatting them. They can be used on their own or in conjunction with other Luxon types; for example, you can use {@link DateTime.plus} to add a Duration object to a DateTime, producing another DateTime. + * + * Here is a brief overview of commonly used methods and getters in Duration: + * + * * **Creation** To create a Duration, use {@link Duration.fromMillis}, {@link Duration.fromObject}, or {@link Duration.fromISO}. + * * **Unit values** See the {@link Duration.years}, {@link Duration.months}, {@link Duration.weeks}, {@link Duration.days}, {@link Duration.hours}, {@link Duration.minutes}, {@link Duration.seconds}, {@link Duration.milliseconds} accessors. + * * **Configuration** See {@link Duration.locale} and {@link Duration.numberingSystem} accessors. + * * **Transformation** To create new Durations out of old ones use {@link Duration.plus}, {@link Duration.minus}, {@link Duration.normalize}, {@link Duration.set}, {@link Duration.reconfigure}, {@link Duration.shiftTo}, and {@link Duration.negate}. + * * **Output** To convert the Duration into other representations, see {@link Duration.as}, {@link Duration.toISO}, {@link Duration.toFormat}, and {@link Duration.toJSON} + * + * There's are more methods documented below. In addition, for more information on subtler topics like internationalization and validity, see the external documentation. + */ + + + var Duration = + /*#__PURE__*/ + function () { + /** + * @private + */ + function Duration(config) { + var accurate = config.conversionAccuracy === "longterm" || false; + /** + * @access private + */ + + this.values = config.values; + /** + * @access private + */ + + this.loc = config.loc || Locale.create(); + /** + * @access private + */ + + this.conversionAccuracy = accurate ? "longterm" : "casual"; + /** + * @access private + */ + + this.invalid = config.invalid || null; + /** + * @access private + */ + + this.matrix = accurate ? accurateMatrix : casualMatrix; + /** + * @access private + */ + + this.isLuxonDuration = true; + } + /** + * Create Duration from a number of milliseconds. + * @param {number} count of milliseconds + * @param {Object} opts - options for parsing + * @param {string} [opts.locale='en-US'] - the locale to use + * @param {string} opts.numberingSystem - the numbering system to use + * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use + * @return {Duration} + */ + + + Duration.fromMillis = function fromMillis(count, opts) { + return Duration.fromObject(Object.assign({ + milliseconds: count + }, opts)); + } + /** + * Create a Duration from a Javascript object with keys like 'years' and 'hours. + * If this object is empty then a zero milliseconds duration is returned. + * @param {Object} obj - the object to create the DateTime from + * @param {number} obj.years + * @param {number} obj.quarters + * @param {number} obj.months + * @param {number} obj.weeks + * @param {number} obj.days + * @param {number} obj.hours + * @param {number} obj.minutes + * @param {number} obj.seconds + * @param {number} obj.milliseconds + * @param {string} [obj.locale='en-US'] - the locale to use + * @param {string} obj.numberingSystem - the numbering system to use + * @param {string} [obj.conversionAccuracy='casual'] - the conversion system to use + * @return {Duration} + */ + ; + + Duration.fromObject = function fromObject(obj) { + if (obj == null || typeof obj !== "object") { + throw new InvalidArgumentError("Duration.fromObject: argument expected to be an object, got " + (obj === null ? "null" : typeof obj)); + } + + return new Duration({ + values: normalizeObject(obj, Duration.normalizeUnit, ["locale", "numberingSystem", "conversionAccuracy", "zone" // a bit of debt; it's super inconvenient internally not to be able to blindly pass this + ]), + loc: Locale.fromObject(obj), + conversionAccuracy: obj.conversionAccuracy + }); + } + /** + * Create a Duration from an ISO 8601 duration string. + * @param {string} text - text to parse + * @param {Object} opts - options for parsing + * @param {string} [opts.locale='en-US'] - the locale to use + * @param {string} opts.numberingSystem - the numbering system to use + * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use + * @see https://en.wikipedia.org/wiki/ISO_8601#Durations + * @example Duration.fromISO('P3Y6M1W4DT12H30M5S').toObject() //=> { years: 3, months: 6, weeks: 1, days: 4, hours: 12, minutes: 30, seconds: 5 } + * @example Duration.fromISO('PT23H').toObject() //=> { hours: 23 } + * @example Duration.fromISO('P5Y3M').toObject() //=> { years: 5, months: 3 } + * @return {Duration} + */ + ; + + Duration.fromISO = function fromISO(text, opts) { + var _parseISODuration = parseISODuration(text), + parsed = _parseISODuration[0]; + + if (parsed) { + var obj = Object.assign(parsed, opts); + return Duration.fromObject(obj); + } else { + return Duration.invalid("unparsable", "the input \"" + text + "\" can't be parsed as ISO 8601"); + } + } + /** + * Create an invalid Duration. + * @param {string} reason - simple string of why this datetime is invalid. Should not contain parameters or anything else data-dependent + * @param {string} [explanation=null] - longer explanation, may include parameters and other useful debugging information + * @return {Duration} + */ + ; + + Duration.invalid = function invalid(reason, explanation) { + if (explanation === void 0) { + explanation = null; + } + + if (!reason) { + throw new InvalidArgumentError("need to specify a reason the Duration is invalid"); + } + + var invalid = reason instanceof Invalid ? reason : new Invalid(reason, explanation); + + if (Settings.throwOnInvalid) { + throw new InvalidDurationError(invalid); + } else { + return new Duration({ + invalid: invalid + }); + } + } + /** + * @private + */ + ; + + Duration.normalizeUnit = function normalizeUnit(unit) { + var normalized = { + year: "years", + years: "years", + quarter: "quarters", + quarters: "quarters", + month: "months", + months: "months", + week: "weeks", + weeks: "weeks", + day: "days", + days: "days", + hour: "hours", + hours: "hours", + minute: "minutes", + minutes: "minutes", + second: "seconds", + seconds: "seconds", + millisecond: "milliseconds", + milliseconds: "milliseconds" + }[unit ? unit.toLowerCase() : unit]; + if (!normalized) throw new InvalidUnitError(unit); + return normalized; + } + /** + * Check if an object is a Duration. Works across context boundaries + * @param {object} o + * @return {boolean} + */ + ; + + Duration.isDuration = function isDuration(o) { + return o && o.isLuxonDuration || false; + } + /** + * Get the locale of a Duration, such 'en-GB' + * @type {string} + */ + ; + + var _proto = Duration.prototype; + + /** + * Returns a string representation of this Duration formatted according to the specified format string. You may use these tokens: + * * `S` for milliseconds + * * `s` for seconds + * * `m` for minutes + * * `h` for hours + * * `d` for days + * * `M` for months + * * `y` for years + * Notes: + * * Add padding by repeating the token, e.g. "yy" pads the years to two digits, "hhhh" pads the hours out to four digits + * * The duration will be converted to the set of units in the format string using {@link Duration.shiftTo} and the Durations's conversion accuracy setting. + * @param {string} fmt - the format string + * @param {Object} opts - options + * @param {boolean} [opts.floor=true] - floor numerical values + * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toFormat("y d s") //=> "1 6 2" + * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toFormat("yy dd sss") //=> "01 06 002" + * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toFormat("M S") //=> "12 518402000" + * @return {string} + */ + _proto.toFormat = function toFormat(fmt, opts) { + if (opts === void 0) { + opts = {}; + } + + // reverse-compat since 1.2; we always round down now, never up, and we do it by default + var fmtOpts = Object.assign({}, opts, { + floor: opts.round !== false && opts.floor !== false + }); + return this.isValid ? Formatter.create(this.loc, fmtOpts).formatDurationFromString(this, fmt) : INVALID; + } + /** + * Returns a Javascript object with this Duration's values. + * @param opts - options for generating the object + * @param {boolean} [opts.includeConfig=false] - include configuration attributes in the output + * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toObject() //=> { years: 1, days: 6, seconds: 2 } + * @return {Object} + */ + ; + + _proto.toObject = function toObject(opts) { + if (opts === void 0) { + opts = {}; + } + + if (!this.isValid) return {}; + var base = Object.assign({}, this.values); + + if (opts.includeConfig) { + base.conversionAccuracy = this.conversionAccuracy; + base.numberingSystem = this.loc.numberingSystem; + base.locale = this.loc.locale; + } + + return base; + } + /** + * Returns an ISO 8601-compliant string representation of this Duration. + * @see https://en.wikipedia.org/wiki/ISO_8601#Durations + * @example Duration.fromObject({ years: 3, seconds: 45 }).toISO() //=> 'P3YT45S' + * @example Duration.fromObject({ months: 4, seconds: 45 }).toISO() //=> 'P4MT45S' + * @example Duration.fromObject({ months: 5 }).toISO() //=> 'P5M' + * @example Duration.fromObject({ minutes: 5 }).toISO() //=> 'PT5M' + * @example Duration.fromObject({ milliseconds: 6 }).toISO() //=> 'PT0.006S' + * @return {string} + */ + ; + + _proto.toISO = function toISO() { + // we could use the formatter, but this is an easier way to get the minimum string + if (!this.isValid) return null; + var s = "P"; + if (this.years !== 0) s += this.years + "Y"; + if (this.months !== 0 || this.quarters !== 0) s += this.months + this.quarters * 3 + "M"; + if (this.weeks !== 0) s += this.weeks + "W"; + if (this.days !== 0) s += this.days + "D"; + if (this.hours !== 0 || this.minutes !== 0 || this.seconds !== 0 || this.milliseconds !== 0) s += "T"; + if (this.hours !== 0) s += this.hours + "H"; + if (this.minutes !== 0) s += this.minutes + "M"; + if (this.seconds !== 0 || this.milliseconds !== 0) s += this.seconds + this.milliseconds / 1000 + "S"; + if (s === "P") s += "T0S"; + return s; + } + /** + * Returns an ISO 8601 representation of this Duration appropriate for use in JSON. + * @return {string} + */ + ; + + _proto.toJSON = function toJSON() { + return this.toISO(); + } + /** + * Returns an ISO 8601 representation of this Duration appropriate for use in debugging. + * @return {string} + */ + ; + + _proto.toString = function toString() { + return this.toISO(); + } + /** + * Returns an milliseconds value of this Duration. + * @return {number} + */ + ; + + _proto.valueOf = function valueOf() { + return this.as("milliseconds"); + } + /** + * Make this Duration longer by the specified amount. Return a newly-constructed Duration. + * @param {Duration|Object|number} duration - The amount to add. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject() + * @return {Duration} + */ + ; + + _proto.plus = function plus(duration) { + if (!this.isValid) return this; + var dur = friendlyDuration(duration), + result = {}; + + for (var _i = 0, _orderedUnits = orderedUnits; _i < _orderedUnits.length; _i++) { + var k = _orderedUnits[_i]; + + if (hasOwnProperty(dur.values, k) || hasOwnProperty(this.values, k)) { + result[k] = dur.get(k) + this.get(k); + } + } + + return clone(this, { + values: result + }, true); + } + /** + * Make this Duration shorter by the specified amount. Return a newly-constructed Duration. + * @param {Duration|Object|number} duration - The amount to subtract. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject() + * @return {Duration} + */ + ; + + _proto.minus = function minus(duration) { + if (!this.isValid) return this; + var dur = friendlyDuration(duration); + return this.plus(dur.negate()); + } + /** + * Get the value of unit. + * @param {string} unit - a unit such as 'minute' or 'day' + * @example Duration.fromObject({years: 2, days: 3}).years //=> 2 + * @example Duration.fromObject({years: 2, days: 3}).months //=> 0 + * @example Duration.fromObject({years: 2, days: 3}).days //=> 3 + * @return {number} + */ + ; + + _proto.get = function get(unit) { + return this[Duration.normalizeUnit(unit)]; + } + /** + * "Set" the values of specified units. Return a newly-constructed Duration. + * @param {Object} values - a mapping of units to numbers + * @example dur.set({ years: 2017 }) + * @example dur.set({ hours: 8, minutes: 30 }) + * @return {Duration} + */ + ; + + _proto.set = function set(values) { + if (!this.isValid) return this; + var mixed = Object.assign(this.values, normalizeObject(values, Duration.normalizeUnit, [])); + return clone(this, { + values: mixed + }); + } + /** + * "Set" the locale and/or numberingSystem. Returns a newly-constructed Duration. + * @example dur.reconfigure({ locale: 'en-GB' }) + * @return {Duration} + */ + ; + + _proto.reconfigure = function reconfigure(_temp) { + var _ref = _temp === void 0 ? {} : _temp, + locale = _ref.locale, + numberingSystem = _ref.numberingSystem, + conversionAccuracy = _ref.conversionAccuracy; + + var loc = this.loc.clone({ + locale: locale, + numberingSystem: numberingSystem + }), + opts = { + loc: loc + }; + + if (conversionAccuracy) { + opts.conversionAccuracy = conversionAccuracy; + } + + return clone(this, opts); + } + /** + * Return the length of the duration in the specified unit. + * @param {string} unit - a unit such as 'minutes' or 'days' + * @example Duration.fromObject({years: 1}).as('days') //=> 365 + * @example Duration.fromObject({years: 1}).as('months') //=> 12 + * @example Duration.fromObject({hours: 60}).as('days') //=> 2.5 + * @return {number} + */ + ; + + _proto.as = function as(unit) { + return this.isValid ? this.shiftTo(unit).get(unit) : NaN; + } + /** + * Reduce this Duration to its canonical representation in its current units. + * @example Duration.fromObject({ years: 2, days: 5000 }).normalize().toObject() //=> { years: 15, days: 255 } + * @example Duration.fromObject({ hours: 12, minutes: -45 }).normalize().toObject() //=> { hours: 11, minutes: 15 } + * @return {Duration} + */ + ; + + _proto.normalize = function normalize() { + if (!this.isValid) return this; + var vals = this.toObject(); + normalizeValues(this.matrix, vals); + return clone(this, { + values: vals + }, true); + } + /** + * Convert this Duration into its representation in a different set of units. + * @example Duration.fromObject({ hours: 1, seconds: 30 }).shiftTo('minutes', 'milliseconds').toObject() //=> { minutes: 60, milliseconds: 30000 } + * @return {Duration} + */ + ; + + _proto.shiftTo = function shiftTo() { + for (var _len = arguments.length, units = new Array(_len), _key = 0; _key < _len; _key++) { + units[_key] = arguments[_key]; + } + + if (!this.isValid) return this; + + if (units.length === 0) { + return this; + } + + units = units.map(function (u) { + return Duration.normalizeUnit(u); + }); + var built = {}, + accumulated = {}, + vals = this.toObject(); + var lastUnit; + normalizeValues(this.matrix, vals); + + for (var _i2 = 0, _orderedUnits2 = orderedUnits; _i2 < _orderedUnits2.length; _i2++) { + var k = _orderedUnits2[_i2]; + + if (units.indexOf(k) >= 0) { + lastUnit = k; + var own = 0; // anything we haven't boiled down yet should get boiled to this unit + + for (var ak in accumulated) { + own += this.matrix[ak][k] * accumulated[ak]; + accumulated[ak] = 0; + } // plus anything that's already in this unit + + + if (isNumber(vals[k])) { + own += vals[k]; + } + + var i = Math.trunc(own); + built[k] = i; + accumulated[k] = own - i; // we'd like to absorb these fractions in another unit + // plus anything further down the chain that should be rolled up in to this + + for (var down in vals) { + if (orderedUnits.indexOf(down) > orderedUnits.indexOf(k)) { + convert(this.matrix, vals, down, built, k); + } + } // otherwise, keep it in the wings to boil it later + + } else if (isNumber(vals[k])) { + accumulated[k] = vals[k]; + } + } // anything leftover becomes the decimal for the last unit + // lastUnit must be defined since units is not empty + + + for (var key in accumulated) { + if (accumulated[key] !== 0) { + built[lastUnit] += key === lastUnit ? accumulated[key] : accumulated[key] / this.matrix[lastUnit][key]; + } + } + + return clone(this, { + values: built + }, true).normalize(); + } + /** + * Return the negative of this Duration. + * @example Duration.fromObject({ hours: 1, seconds: 30 }).negate().toObject() //=> { hours: -1, seconds: -30 } + * @return {Duration} + */ + ; + + _proto.negate = function negate() { + if (!this.isValid) return this; + var negated = {}; + + for (var _i3 = 0, _Object$keys = Object.keys(this.values); _i3 < _Object$keys.length; _i3++) { + var k = _Object$keys[_i3]; + negated[k] = -this.values[k]; + } + + return clone(this, { + values: negated + }, true); + } + /** + * Get the years. + * @type {number} + */ + ; + + /** + * Equality check + * Two Durations are equal iff they have the same units and the same values for each unit. + * @param {Duration} other + * @return {boolean} + */ + _proto.equals = function equals(other) { + if (!this.isValid || !other.isValid) { + return false; + } + + if (!this.loc.equals(other.loc)) { + return false; + } + + for (var _i4 = 0, _orderedUnits3 = orderedUnits; _i4 < _orderedUnits3.length; _i4++) { + var u = _orderedUnits3[_i4]; + + if (this.values[u] !== other.values[u]) { + return false; + } + } + + return true; + }; + + _createClass(Duration, [{ + key: "locale", + get: function get() { + return this.isValid ? this.loc.locale : null; + } + /** + * Get the numbering system of a Duration, such 'beng'. The numbering system is used when formatting the Duration + * + * @type {string} + */ + + }, { + key: "numberingSystem", + get: function get() { + return this.isValid ? this.loc.numberingSystem : null; + } + }, { + key: "years", + get: function get() { + return this.isValid ? this.values.years || 0 : NaN; + } + /** + * Get the quarters. + * @type {number} + */ + + }, { + key: "quarters", + get: function get() { + return this.isValid ? this.values.quarters || 0 : NaN; + } + /** + * Get the months. + * @type {number} + */ + + }, { + key: "months", + get: function get() { + return this.isValid ? this.values.months || 0 : NaN; + } + /** + * Get the weeks + * @type {number} + */ + + }, { + key: "weeks", + get: function get() { + return this.isValid ? this.values.weeks || 0 : NaN; + } + /** + * Get the days. + * @type {number} + */ + + }, { + key: "days", + get: function get() { + return this.isValid ? this.values.days || 0 : NaN; + } + /** + * Get the hours. + * @type {number} + */ + + }, { + key: "hours", + get: function get() { + return this.isValid ? this.values.hours || 0 : NaN; + } + /** + * Get the minutes. + * @type {number} + */ + + }, { + key: "minutes", + get: function get() { + return this.isValid ? this.values.minutes || 0 : NaN; + } + /** + * Get the seconds. + * @return {number} + */ + + }, { + key: "seconds", + get: function get() { + return this.isValid ? this.values.seconds || 0 : NaN; + } + /** + * Get the milliseconds. + * @return {number} + */ + + }, { + key: "milliseconds", + get: function get() { + return this.isValid ? this.values.milliseconds || 0 : NaN; + } + /** + * Returns whether the Duration is invalid. Invalid durations are returned by diff operations + * on invalid DateTimes or Intervals. + * @return {boolean} + */ + + }, { + key: "isValid", + get: function get() { + return this.invalid === null; + } + /** + * Returns an error code if this Duration became invalid, or null if the Duration is valid + * @return {string} + */ + + }, { + key: "invalidReason", + get: function get() { + return this.invalid ? this.invalid.reason : null; + } + /** + * Returns an explanation of why this Duration became invalid, or null if the Duration is valid + * @type {string} + */ + + }, { + key: "invalidExplanation", + get: function get() { + return this.invalid ? this.invalid.explanation : null; + } + }]); + + return Duration; + }(); + function friendlyDuration(durationish) { + if (isNumber(durationish)) { + return Duration.fromMillis(durationish); + } else if (Duration.isDuration(durationish)) { + return durationish; + } else if (typeof durationish === "object") { + return Duration.fromObject(durationish); + } else { + throw new InvalidArgumentError("Unknown duration argument " + durationish + " of type " + typeof durationish); + } + } + + var INVALID$1 = "Invalid Interval"; // checks if the start is equal to or before the end + + function validateStartEnd(start, end) { + if (!start || !start.isValid) { + return Interval.invalid("missing or invalid start"); + } else if (!end || !end.isValid) { + return Interval.invalid("missing or invalid end"); + } else if (end < start) { + return Interval.invalid("end before start", "The end of an interval must be after its start, but you had start=" + start.toISO() + " and end=" + end.toISO()); + } else { + return null; + } + } + /** + * An Interval object represents a half-open interval of time, where each endpoint is a {@link DateTime}. Conceptually, it's a container for those two endpoints, accompanied by methods for creating, parsing, interrogating, comparing, transforming, and formatting them. + * + * Here is a brief overview of the most commonly used methods and getters in Interval: + * + * * **Creation** To create an Interval, use {@link fromDateTimes}, {@link after}, {@link before}, or {@link fromISO}. + * * **Accessors** Use {@link start} and {@link end} to get the start and end. + * * **Interrogation** To analyze the Interval, use {@link count}, {@link length}, {@link hasSame}, {@link contains}, {@link isAfter}, or {@link isBefore}. + * * **Transformation** To create other Intervals out of this one, use {@link set}, {@link splitAt}, {@link splitBy}, {@link divideEqually}, {@link merge}, {@link xor}, {@link union}, {@link intersection}, or {@link difference}. + * * **Comparison** To compare this Interval to another one, use {@link equals}, {@link overlaps}, {@link abutsStart}, {@link abutsEnd}, {@link engulfs} + * * **Output*** To convert the Interval into other representations, see {@link toString}, {@link toISO}, {@link toFormat}, and {@link toDuration}. + */ + + + var Interval = + /*#__PURE__*/ + function () { + /** + * @private + */ + function Interval(config) { + /** + * @access private + */ + this.s = config.start; + /** + * @access private + */ + + this.e = config.end; + /** + * @access private + */ + + this.invalid = config.invalid || null; + /** + * @access private + */ + + this.isLuxonInterval = true; + } + /** + * Create an invalid Interval. + * @param {string} reason - simple string of why this Interval is invalid. Should not contain parameters or anything else data-dependent + * @param {string} [explanation=null] - longer explanation, may include parameters and other useful debugging information + * @return {Interval} + */ + + + Interval.invalid = function invalid(reason, explanation) { + if (explanation === void 0) { + explanation = null; + } + + if (!reason) { + throw new InvalidArgumentError("need to specify a reason the Interval is invalid"); + } + + var invalid = reason instanceof Invalid ? reason : new Invalid(reason, explanation); + + if (Settings.throwOnInvalid) { + throw new InvalidIntervalError(invalid); + } else { + return new Interval({ + invalid: invalid + }); + } + } + /** + * Create an Interval from a start DateTime and an end DateTime. Inclusive of the start but not the end. + * @param {DateTime|Date|Object} start + * @param {DateTime|Date|Object} end + * @return {Interval} + */ + ; + + Interval.fromDateTimes = function fromDateTimes(start, end) { + var builtStart = friendlyDateTime(start), + builtEnd = friendlyDateTime(end); + var validateError = validateStartEnd(builtStart, builtEnd); + + if (validateError == null) { + return new Interval({ + start: builtStart, + end: builtEnd + }); + } else { + return validateError; + } + } + /** + * Create an Interval from a start DateTime and a Duration to extend to. + * @param {DateTime|Date|Object} start + * @param {Duration|Object|number} duration - the length of the Interval. + * @return {Interval} + */ + ; + + Interval.after = function after(start, duration) { + var dur = friendlyDuration(duration), + dt = friendlyDateTime(start); + return Interval.fromDateTimes(dt, dt.plus(dur)); + } + /** + * Create an Interval from an end DateTime and a Duration to extend backwards to. + * @param {DateTime|Date|Object} end + * @param {Duration|Object|number} duration - the length of the Interval. + * @return {Interval} + */ + ; + + Interval.before = function before(end, duration) { + var dur = friendlyDuration(duration), + dt = friendlyDateTime(end); + return Interval.fromDateTimes(dt.minus(dur), dt); + } + /** + * Create an Interval from an ISO 8601 string. + * Accepts `/`, `/`, and `/` formats. + * @param {string} text - the ISO string to parse + * @param {Object} [opts] - options to pass {@link DateTime.fromISO} and optionally {@link Duration.fromISO} + * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals + * @return {Interval} + */ + ; + + Interval.fromISO = function fromISO(text, opts) { + var _split = (text || "").split("/", 2), + s = _split[0], + e = _split[1]; + + if (s && e) { + var start = DateTime.fromISO(s, opts), + end = DateTime.fromISO(e, opts); + + if (start.isValid && end.isValid) { + return Interval.fromDateTimes(start, end); + } + + if (start.isValid) { + var dur = Duration.fromISO(e, opts); + + if (dur.isValid) { + return Interval.after(start, dur); + } + } else if (end.isValid) { + var _dur = Duration.fromISO(s, opts); + + if (_dur.isValid) { + return Interval.before(end, _dur); + } + } + } + + return Interval.invalid("unparsable", "the input \"" + text + "\" can't be parsed asISO 8601"); + } + /** + * Check if an object is an Interval. Works across context boundaries + * @param {object} o + * @return {boolean} + */ + ; + + Interval.isInterval = function isInterval(o) { + return o && o.isLuxonInterval || false; + } + /** + * Returns the start of the Interval + * @type {DateTime} + */ + ; + + var _proto = Interval.prototype; + + /** + * Returns the length of the Interval in the specified unit. + * @param {string} unit - the unit (such as 'hours' or 'days') to return the length in. + * @return {number} + */ + _proto.length = function length(unit) { + if (unit === void 0) { + unit = "milliseconds"; + } + + return this.isValid ? this.toDuration.apply(this, [unit]).get(unit) : NaN; + } + /** + * Returns the count of minutes, hours, days, months, or years included in the Interval, even in part. + * Unlike {@link length} this counts sections of the calendar, not periods of time, e.g. specifying 'day' + * asks 'what dates are included in this interval?', not 'how many days long is this interval?' + * @param {string} [unit='milliseconds'] - the unit of time to count. + * @return {number} + */ + ; + + _proto.count = function count(unit) { + if (unit === void 0) { + unit = "milliseconds"; + } + + if (!this.isValid) return NaN; + var start = this.start.startOf(unit), + end = this.end.startOf(unit); + return Math.floor(end.diff(start, unit).get(unit)) + 1; + } + /** + * Returns whether this Interval's start and end are both in the same unit of time + * @param {string} unit - the unit of time to check sameness on + * @return {boolean} + */ + ; + + _proto.hasSame = function hasSame(unit) { + return this.isValid ? this.e.minus(1).hasSame(this.s, unit) : false; + } + /** + * Return whether this Interval has the same start and end DateTimes. + * @return {boolean} + */ + ; + + _proto.isEmpty = function isEmpty() { + return this.s.valueOf() === this.e.valueOf(); + } + /** + * Return whether this Interval's start is after the specified DateTime. + * @param {DateTime} dateTime + * @return {boolean} + */ + ; + + _proto.isAfter = function isAfter(dateTime) { + if (!this.isValid) return false; + return this.s > dateTime; + } + /** + * Return whether this Interval's end is before the specified DateTime. + * @param {DateTime} dateTime + * @return {boolean} + */ + ; + + _proto.isBefore = function isBefore(dateTime) { + if (!this.isValid) return false; + return this.e <= dateTime; + } + /** + * Return whether this Interval contains the specified DateTime. + * @param {DateTime} dateTime + * @return {boolean} + */ + ; + + _proto.contains = function contains(dateTime) { + if (!this.isValid) return false; + return this.s <= dateTime && this.e > dateTime; + } + /** + * "Sets" the start and/or end dates. Returns a newly-constructed Interval. + * @param {Object} values - the values to set + * @param {DateTime} values.start - the starting DateTime + * @param {DateTime} values.end - the ending DateTime + * @return {Interval} + */ + ; + + _proto.set = function set(_temp) { + var _ref = _temp === void 0 ? {} : _temp, + start = _ref.start, + end = _ref.end; + + if (!this.isValid) return this; + return Interval.fromDateTimes(start || this.s, end || this.e); + } + /** + * Split this Interval at each of the specified DateTimes + * @param {...[DateTime]} dateTimes - the unit of time to count. + * @return {[Interval]} + */ + ; + + _proto.splitAt = function splitAt() { + var _this = this; + + if (!this.isValid) return []; + + for (var _len = arguments.length, dateTimes = new Array(_len), _key = 0; _key < _len; _key++) { + dateTimes[_key] = arguments[_key]; + } + + var sorted = dateTimes.map(friendlyDateTime).filter(function (d) { + return _this.contains(d); + }).sort(), + results = []; + var s = this.s, + i = 0; + + while (s < this.e) { + var added = sorted[i] || this.e, + next = +added > +this.e ? this.e : added; + results.push(Interval.fromDateTimes(s, next)); + s = next; + i += 1; + } + + return results; + } + /** + * Split this Interval into smaller Intervals, each of the specified length. + * Left over time is grouped into a smaller interval + * @param {Duration|Object|number} duration - The length of each resulting interval. + * @return {[Interval]} + */ + ; + + _proto.splitBy = function splitBy(duration) { + var dur = friendlyDuration(duration); + + if (!this.isValid || !dur.isValid || dur.as("milliseconds") === 0) { + return []; + } + + var s = this.s, + added, + next; + var results = []; + + while (s < this.e) { + added = s.plus(dur); + next = +added > +this.e ? this.e : added; + results.push(Interval.fromDateTimes(s, next)); + s = next; + } + + return results; + } + /** + * Split this Interval into the specified number of smaller intervals. + * @param {number} numberOfParts - The number of Intervals to divide the Interval into. + * @return {[Interval]} + */ + ; + + _proto.divideEqually = function divideEqually(numberOfParts) { + if (!this.isValid) return []; + return this.splitBy(this.length() / numberOfParts).slice(0, numberOfParts); + } + /** + * Return whether this Interval overlaps with the specified Interval + * @param {Interval} other + * @return {boolean} + */ + ; + + _proto.overlaps = function overlaps(other) { + return this.e > other.s && this.s < other.e; + } + /** + * Return whether this Interval's end is adjacent to the specified Interval's start. + * @param {Interval} other + * @return {boolean} + */ + ; + + _proto.abutsStart = function abutsStart(other) { + if (!this.isValid) return false; + return +this.e === +other.s; + } + /** + * Return whether this Interval's start is adjacent to the specified Interval's end. + * @param {Interval} other + * @return {boolean} + */ + ; + + _proto.abutsEnd = function abutsEnd(other) { + if (!this.isValid) return false; + return +other.e === +this.s; + } + /** + * Return whether this Interval engulfs the start and end of the specified Interval. + * @param {Interval} other + * @return {boolean} + */ + ; + + _proto.engulfs = function engulfs(other) { + if (!this.isValid) return false; + return this.s <= other.s && this.e >= other.e; + } + /** + * Return whether this Interval has the same start and end as the specified Interval. + * @param {Interval} other + * @return {boolean} + */ + ; + + _proto.equals = function equals(other) { + if (!this.isValid || !other.isValid) { + return false; + } + + return this.s.equals(other.s) && this.e.equals(other.e); + } + /** + * Return an Interval representing the intersection of this Interval and the specified Interval. + * Specifically, the resulting Interval has the maximum start time and the minimum end time of the two Intervals. + * Returns null if the intersection is empty, i.e., the intervals don't intersect. + * @param {Interval} other + * @return {Interval} + */ + ; + + _proto.intersection = function intersection(other) { + if (!this.isValid) return this; + var s = this.s > other.s ? this.s : other.s, + e = this.e < other.e ? this.e : other.e; + + if (s > e) { + return null; + } else { + return Interval.fromDateTimes(s, e); + } + } + /** + * Return an Interval representing the union of this Interval and the specified Interval. + * Specifically, the resulting Interval has the minimum start time and the maximum end time of the two Intervals. + * @param {Interval} other + * @return {Interval} + */ + ; + + _proto.union = function union(other) { + if (!this.isValid) return this; + var s = this.s < other.s ? this.s : other.s, + e = this.e > other.e ? this.e : other.e; + return Interval.fromDateTimes(s, e); + } + /** + * Merge an array of Intervals into a equivalent minimal set of Intervals. + * Combines overlapping and adjacent Intervals. + * @param {[Interval]} intervals + * @return {[Interval]} + */ + ; + + Interval.merge = function merge(intervals) { + var _intervals$sort$reduc = intervals.sort(function (a, b) { + return a.s - b.s; + }).reduce(function (_ref2, item) { + var sofar = _ref2[0], + current = _ref2[1]; + + if (!current) { + return [sofar, item]; + } else if (current.overlaps(item) || current.abutsStart(item)) { + return [sofar, current.union(item)]; + } else { + return [sofar.concat([current]), item]; + } + }, [[], null]), + found = _intervals$sort$reduc[0], + final = _intervals$sort$reduc[1]; + + if (final) { + found.push(final); + } + + return found; + } + /** + * Return an array of Intervals representing the spans of time that only appear in one of the specified Intervals. + * @param {[Interval]} intervals + * @return {[Interval]} + */ + ; + + Interval.xor = function xor(intervals) { + var _Array$prototype; + + var start = null, + currentCount = 0; + + var results = [], + ends = intervals.map(function (i) { + return [{ + time: i.s, + type: "s" + }, { + time: i.e, + type: "e" + }]; + }), + flattened = (_Array$prototype = Array.prototype).concat.apply(_Array$prototype, ends), + arr = flattened.sort(function (a, b) { + return a.time - b.time; + }); + + for (var _iterator = arr, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) { + var _ref3; + + if (_isArray) { + if (_i >= _iterator.length) break; + _ref3 = _iterator[_i++]; + } else { + _i = _iterator.next(); + if (_i.done) break; + _ref3 = _i.value; + } + + var i = _ref3; + currentCount += i.type === "s" ? 1 : -1; + + if (currentCount === 1) { + start = i.time; + } else { + if (start && +start !== +i.time) { + results.push(Interval.fromDateTimes(start, i.time)); + } + + start = null; + } + } + + return Interval.merge(results); + } + /** + * Return an Interval representing the span of time in this Interval that doesn't overlap with any of the specified Intervals. + * @param {...Interval} intervals + * @return {[Interval]} + */ + ; + + _proto.difference = function difference() { + var _this2 = this; + + for (var _len2 = arguments.length, intervals = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + intervals[_key2] = arguments[_key2]; + } + + return Interval.xor([this].concat(intervals)).map(function (i) { + return _this2.intersection(i); + }).filter(function (i) { + return i && !i.isEmpty(); + }); + } + /** + * Returns a string representation of this Interval appropriate for debugging. + * @return {string} + */ + ; + + _proto.toString = function toString() { + if (!this.isValid) return INVALID$1; + return "[" + this.s.toISO() + " \u2013 " + this.e.toISO() + ")"; + } + /** + * Returns an ISO 8601-compliant string representation of this Interval. + * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals + * @param {Object} opts - The same options as {@link DateTime.toISO} + * @return {string} + */ + ; + + _proto.toISO = function toISO(opts) { + if (!this.isValid) return INVALID$1; + return this.s.toISO(opts) + "/" + this.e.toISO(opts); + } + /** + * Returns a string representation of this Interval formatted according to the specified format string. + * @param {string} dateFormat - the format string. This string formats the start and end time. See {@link DateTime.toFormat} for details. + * @param {Object} opts - options + * @param {string} [opts.separator = ' – '] - a separator to place between the start and end representations + * @return {string} + */ + ; + + _proto.toFormat = function toFormat(dateFormat, _temp2) { + var _ref4 = _temp2 === void 0 ? {} : _temp2, + _ref4$separator = _ref4.separator, + separator = _ref4$separator === void 0 ? " – " : _ref4$separator; + + if (!this.isValid) return INVALID$1; + return "" + this.s.toFormat(dateFormat) + separator + this.e.toFormat(dateFormat); + } + /** + * Return a Duration representing the time spanned by this interval. + * @param {string|string[]} [unit=['milliseconds']] - the unit or units (such as 'hours' or 'days') to include in the duration. + * @param {Object} opts - options that affect the creation of the Duration + * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use + * @example Interval.fromDateTimes(dt1, dt2).toDuration().toObject() //=> { milliseconds: 88489257 } + * @example Interval.fromDateTimes(dt1, dt2).toDuration('days').toObject() //=> { days: 1.0241812152777778 } + * @example Interval.fromDateTimes(dt1, dt2).toDuration(['hours', 'minutes']).toObject() //=> { hours: 24, minutes: 34.82095 } + * @example Interval.fromDateTimes(dt1, dt2).toDuration(['hours', 'minutes', 'seconds']).toObject() //=> { hours: 24, minutes: 34, seconds: 49.257 } + * @example Interval.fromDateTimes(dt1, dt2).toDuration('seconds').toObject() //=> { seconds: 88489.257 } + * @return {Duration} + */ + ; + + _proto.toDuration = function toDuration(unit, opts) { + if (!this.isValid) { + return Duration.invalid(this.invalidReason); + } + + return this.e.diff(this.s, unit, opts); + } + /** + * Run mapFn on the interval start and end, returning a new Interval from the resulting DateTimes + * @param {function} mapFn + * @return {Interval} + * @example Interval.fromDateTimes(dt1, dt2).mapEndpoints(endpoint => endpoint.toUTC()) + * @example Interval.fromDateTimes(dt1, dt2).mapEndpoints(endpoint => endpoint.plus({ hours: 2 })) + */ + ; + + _proto.mapEndpoints = function mapEndpoints(mapFn) { + return Interval.fromDateTimes(mapFn(this.s), mapFn(this.e)); + }; + + _createClass(Interval, [{ + key: "start", + get: function get() { + return this.isValid ? this.s : null; + } + /** + * Returns the end of the Interval + * @type {DateTime} + */ + + }, { + key: "end", + get: function get() { + return this.isValid ? this.e : null; + } + /** + * Returns whether this Interval's end is at least its start, i.e. that the Interval isn't 'backwards'. + * @type {boolean} + */ + + }, { + key: "isValid", + get: function get() { + return this.invalidReason === null; + } + /** + * Returns an error code if this Interval is invalid, or null if the Interval is valid + * @type {string} + */ + + }, { + key: "invalidReason", + get: function get() { + return this.invalid ? this.invalid.reason : null; + } + /** + * Returns an explanation of why this Interval became invalid, or null if the Interval is valid + * @type {string} + */ + + }, { + key: "invalidExplanation", + get: function get() { + return this.invalid ? this.invalid.explanation : null; + } + }]); + + return Interval; + }(); + + /** + * The Info class contains static methods for retrieving general time and date related data. For example, it has methods for finding out if a time zone has a DST, for listing the months in any supported locale, and for discovering which of Luxon features are available in the current environment. + */ + + var Info = + /*#__PURE__*/ + function () { + function Info() {} + + /** + * Return whether the specified zone contains a DST. + * @param {string|Zone} [zone='local'] - Zone to check. Defaults to the environment's local zone. + * @return {boolean} + */ + Info.hasDST = function hasDST(zone) { + if (zone === void 0) { + zone = Settings.defaultZone; + } + + var proto = DateTime.local().setZone(zone).set({ + month: 12 + }); + return !zone.universal && proto.offset !== proto.set({ + month: 6 + }).offset; + } + /** + * Return whether the specified zone is a valid IANA specifier. + * @param {string} zone - Zone to check + * @return {boolean} + */ + ; + + Info.isValidIANAZone = function isValidIANAZone(zone) { + return IANAZone.isValidSpecifier(zone) && IANAZone.isValidZone(zone); + } + /** + * Converts the input into a {@link Zone} instance. + * + * * If `input` is already a Zone instance, it is returned unchanged. + * * If `input` is a string containing a valid time zone name, a Zone instance + * with that name is returned. + * * If `input` is a string that doesn't refer to a known time zone, a Zone + * instance with {@link Zone.isValid} == false is returned. + * * If `input is a number, a Zone instance with the specified fixed offset + * in minutes is returned. + * * If `input` is `null` or `undefined`, the default zone is returned. + * @param {string|Zone|number} [input] - the value to be converted + * @return {Zone} + */ + ; + + Info.normalizeZone = function normalizeZone$1(input) { + return normalizeZone(input, Settings.defaultZone); + } + /** + * Return an array of standalone month names. + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat + * @param {string} [length='long'] - the length of the month representation, such as "numeric", "2-digit", "narrow", "short", "long" + * @param {Object} opts - options + * @param {string} [opts.locale] - the locale code + * @param {string} [opts.numberingSystem=null] - the numbering system + * @param {string} [opts.outputCalendar='gregory'] - the calendar + * @example Info.months()[0] //=> 'January' + * @example Info.months('short')[0] //=> 'Jan' + * @example Info.months('numeric')[0] //=> '1' + * @example Info.months('short', { locale: 'fr-CA' } )[0] //=> 'janv.' + * @example Info.months('numeric', { locale: 'ar' })[0] //=> '١' + * @example Info.months('long', { outputCalendar: 'islamic' })[0] //=> 'Rabiʻ I' + * @return {[string]} + */ + ; + + Info.months = function months(length, _temp) { + if (length === void 0) { + length = "long"; + } + + var _ref = _temp === void 0 ? {} : _temp, + _ref$locale = _ref.locale, + locale = _ref$locale === void 0 ? null : _ref$locale, + _ref$numberingSystem = _ref.numberingSystem, + numberingSystem = _ref$numberingSystem === void 0 ? null : _ref$numberingSystem, + _ref$outputCalendar = _ref.outputCalendar, + outputCalendar = _ref$outputCalendar === void 0 ? "gregory" : _ref$outputCalendar; + + return Locale.create(locale, numberingSystem, outputCalendar).months(length); + } + /** + * Return an array of format month names. + * Format months differ from standalone months in that they're meant to appear next to the day of the month. In some languages, that + * changes the string. + * See {@link months} + * @param {string} [length='long'] - the length of the month representation, such as "numeric", "2-digit", "narrow", "short", "long" + * @param {Object} opts - options + * @param {string} [opts.locale] - the locale code + * @param {string} [opts.numberingSystem=null] - the numbering system + * @param {string} [opts.outputCalendar='gregory'] - the calendar + * @return {[string]} + */ + ; + + Info.monthsFormat = function monthsFormat(length, _temp2) { + if (length === void 0) { + length = "long"; + } + + var _ref2 = _temp2 === void 0 ? {} : _temp2, + _ref2$locale = _ref2.locale, + locale = _ref2$locale === void 0 ? null : _ref2$locale, + _ref2$numberingSystem = _ref2.numberingSystem, + numberingSystem = _ref2$numberingSystem === void 0 ? null : _ref2$numberingSystem, + _ref2$outputCalendar = _ref2.outputCalendar, + outputCalendar = _ref2$outputCalendar === void 0 ? "gregory" : _ref2$outputCalendar; + + return Locale.create(locale, numberingSystem, outputCalendar).months(length, true); + } + /** + * Return an array of standalone week names. + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat + * @param {string} [length='long'] - the length of the month representation, such as "narrow", "short", "long". + * @param {Object} opts - options + * @param {string} [opts.locale] - the locale code + * @param {string} [opts.numberingSystem=null] - the numbering system + * @example Info.weekdays()[0] //=> 'Monday' + * @example Info.weekdays('short')[0] //=> 'Mon' + * @example Info.weekdays('short', { locale: 'fr-CA' })[0] //=> 'lun.' + * @example Info.weekdays('short', { locale: 'ar' })[0] //=> 'الاثنين' + * @return {[string]} + */ + ; + + Info.weekdays = function weekdays(length, _temp3) { + if (length === void 0) { + length = "long"; + } + + var _ref3 = _temp3 === void 0 ? {} : _temp3, + _ref3$locale = _ref3.locale, + locale = _ref3$locale === void 0 ? null : _ref3$locale, + _ref3$numberingSystem = _ref3.numberingSystem, + numberingSystem = _ref3$numberingSystem === void 0 ? null : _ref3$numberingSystem; + + return Locale.create(locale, numberingSystem, null).weekdays(length); + } + /** + * Return an array of format week names. + * Format weekdays differ from standalone weekdays in that they're meant to appear next to more date information. In some languages, that + * changes the string. + * See {@link weekdays} + * @param {string} [length='long'] - the length of the month representation, such as "narrow", "short", "long". + * @param {Object} opts - options + * @param {string} [opts.locale=null] - the locale code + * @param {string} [opts.numberingSystem=null] - the numbering system + * @return {[string]} + */ + ; + + Info.weekdaysFormat = function weekdaysFormat(length, _temp4) { + if (length === void 0) { + length = "long"; + } + + var _ref4 = _temp4 === void 0 ? {} : _temp4, + _ref4$locale = _ref4.locale, + locale = _ref4$locale === void 0 ? null : _ref4$locale, + _ref4$numberingSystem = _ref4.numberingSystem, + numberingSystem = _ref4$numberingSystem === void 0 ? null : _ref4$numberingSystem; + + return Locale.create(locale, numberingSystem, null).weekdays(length, true); + } + /** + * Return an array of meridiems. + * @param {Object} opts - options + * @param {string} [opts.locale] - the locale code + * @example Info.meridiems() //=> [ 'AM', 'PM' ] + * @example Info.meridiems({ locale: 'my' }) //=> [ 'နံနက်', 'ညနေ' ] + * @return {[string]} + */ + ; + + Info.meridiems = function meridiems(_temp5) { + var _ref5 = _temp5 === void 0 ? {} : _temp5, + _ref5$locale = _ref5.locale, + locale = _ref5$locale === void 0 ? null : _ref5$locale; + + return Locale.create(locale).meridiems(); + } + /** + * Return an array of eras, such as ['BC', 'AD']. The locale can be specified, but the calendar system is always Gregorian. + * @param {string} [length='short'] - the length of the era representation, such as "short" or "long". + * @param {Object} opts - options + * @param {string} [opts.locale] - the locale code + * @example Info.eras() //=> [ 'BC', 'AD' ] + * @example Info.eras('long') //=> [ 'Before Christ', 'Anno Domini' ] + * @example Info.eras('long', { locale: 'fr' }) //=> [ 'avant Jésus-Christ', 'après Jésus-Christ' ] + * @return {[string]} + */ + ; + + Info.eras = function eras(length, _temp6) { + if (length === void 0) { + length = "short"; + } + + var _ref6 = _temp6 === void 0 ? {} : _temp6, + _ref6$locale = _ref6.locale, + locale = _ref6$locale === void 0 ? null : _ref6$locale; + + return Locale.create(locale, null, "gregory").eras(length); + } + /** + * Return the set of available features in this environment. + * Some features of Luxon are not available in all environments. For example, on older browsers, timezone support is not available. Use this function to figure out if that's the case. + * Keys: + * * `zones`: whether this environment supports IANA timezones + * * `intlTokens`: whether this environment supports internationalized token-based formatting/parsing + * * `intl`: whether this environment supports general internationalization + * * `relative`: whether this environment supports relative time formatting + * @example Info.features() //=> { intl: true, intlTokens: false, zones: true, relative: false } + * @return {Object} + */ + ; + + Info.features = function features() { + var intl = false, + intlTokens = false, + zones = false, + relative = false; + + if (hasIntl()) { + intl = true; + intlTokens = hasFormatToParts(); + relative = hasRelative(); + + try { + zones = new Intl.DateTimeFormat("en", { + timeZone: "America/New_York" + }).resolvedOptions().timeZone === "America/New_York"; + } catch (e) { + zones = false; + } + } + + return { + intl: intl, + intlTokens: intlTokens, + zones: zones, + relative: relative + }; + }; + + return Info; + }(); + + function dayDiff(earlier, later) { + var utcDayStart = function utcDayStart(dt) { + return dt.toUTC(0, { + keepLocalTime: true + }).startOf("day").valueOf(); + }, + ms = utcDayStart(later) - utcDayStart(earlier); + + return Math.floor(Duration.fromMillis(ms).as("days")); + } + + function highOrderDiffs(cursor, later, units) { + var differs = [["years", function (a, b) { + return b.year - a.year; + }], ["months", function (a, b) { + return b.month - a.month + (b.year - a.year) * 12; + }], ["weeks", function (a, b) { + var days = dayDiff(a, b); + return (days - days % 7) / 7; + }], ["days", dayDiff]]; + var results = {}; + var lowestOrder, highWater; + + for (var _i = 0, _differs = differs; _i < _differs.length; _i++) { + var _differs$_i = _differs[_i], + unit = _differs$_i[0], + differ = _differs$_i[1]; + + if (units.indexOf(unit) >= 0) { + var _cursor$plus; + + lowestOrder = unit; + var delta = differ(cursor, later); + highWater = cursor.plus((_cursor$plus = {}, _cursor$plus[unit] = delta, _cursor$plus)); + + if (highWater > later) { + var _cursor$plus2; + + cursor = cursor.plus((_cursor$plus2 = {}, _cursor$plus2[unit] = delta - 1, _cursor$plus2)); + delta -= 1; + } else { + cursor = highWater; + } + + results[unit] = delta; + } + } + + return [cursor, results, highWater, lowestOrder]; + } + + function _diff (earlier, later, units, opts) { + var _highOrderDiffs = highOrderDiffs(earlier, later, units), + cursor = _highOrderDiffs[0], + results = _highOrderDiffs[1], + highWater = _highOrderDiffs[2], + lowestOrder = _highOrderDiffs[3]; + + var remainingMillis = later - cursor; + var lowerOrderUnits = units.filter(function (u) { + return ["hours", "minutes", "seconds", "milliseconds"].indexOf(u) >= 0; + }); + + if (lowerOrderUnits.length === 0) { + if (highWater < later) { + var _cursor$plus3; + + highWater = cursor.plus((_cursor$plus3 = {}, _cursor$plus3[lowestOrder] = 1, _cursor$plus3)); + } + + if (highWater !== cursor) { + results[lowestOrder] = (results[lowestOrder] || 0) + remainingMillis / (highWater - cursor); + } + } + + var duration = Duration.fromObject(Object.assign(results, opts)); + + if (lowerOrderUnits.length > 0) { + var _Duration$fromMillis; + + return (_Duration$fromMillis = Duration.fromMillis(remainingMillis, opts)).shiftTo.apply(_Duration$fromMillis, lowerOrderUnits).plus(duration); + } else { + return duration; + } + } + + var numberingSystems = { + arab: "[\u0660-\u0669]", + arabext: "[\u06F0-\u06F9]", + bali: "[\u1B50-\u1B59]", + beng: "[\u09E6-\u09EF]", + deva: "[\u0966-\u096F]", + fullwide: "[\uFF10-\uFF19]", + gujr: "[\u0AE6-\u0AEF]", + hanidec: "[〇|一|二|三|四|五|六|七|八|九]", + khmr: "[\u17E0-\u17E9]", + knda: "[\u0CE6-\u0CEF]", + laoo: "[\u0ED0-\u0ED9]", + limb: "[\u1946-\u194F]", + mlym: "[\u0D66-\u0D6F]", + mong: "[\u1810-\u1819]", + mymr: "[\u1040-\u1049]", + orya: "[\u0B66-\u0B6F]", + tamldec: "[\u0BE6-\u0BEF]", + telu: "[\u0C66-\u0C6F]", + thai: "[\u0E50-\u0E59]", + tibt: "[\u0F20-\u0F29]", + latn: "\\d" + }; + var numberingSystemsUTF16 = { + arab: [1632, 1641], + arabext: [1776, 1785], + bali: [6992, 7001], + beng: [2534, 2543], + deva: [2406, 2415], + fullwide: [65296, 65303], + gujr: [2790, 2799], + khmr: [6112, 6121], + knda: [3302, 3311], + laoo: [3792, 3801], + limb: [6470, 6479], + mlym: [3430, 3439], + mong: [6160, 6169], + mymr: [4160, 4169], + orya: [2918, 2927], + tamldec: [3046, 3055], + telu: [3174, 3183], + thai: [3664, 3673], + tibt: [3872, 3881] + }; // eslint-disable-next-line + + var hanidecChars = numberingSystems.hanidec.replace(/[\[|\]]/g, "").split(""); + function parseDigits(str) { + var value = parseInt(str, 10); + + if (isNaN(value)) { + value = ""; + + for (var i = 0; i < str.length; i++) { + var code = str.charCodeAt(i); + + if (str[i].search(numberingSystems.hanidec) !== -1) { + value += hanidecChars.indexOf(str[i]); + } else { + for (var key in numberingSystemsUTF16) { + var _numberingSystemsUTF = numberingSystemsUTF16[key], + min = _numberingSystemsUTF[0], + max = _numberingSystemsUTF[1]; + + if (code >= min && code <= max) { + value += code - min; + } + } + } + } + + return parseInt(value, 10); + } else { + return value; + } + } + function digitRegex(_ref, append) { + var numberingSystem = _ref.numberingSystem; + + if (append === void 0) { + append = ""; + } + + return new RegExp("" + numberingSystems[numberingSystem || "latn"] + append); + } + + var MISSING_FTP = "missing Intl.DateTimeFormat.formatToParts support"; + + function intUnit(regex, post) { + if (post === void 0) { + post = function post(i) { + return i; + }; + } + + return { + regex: regex, + deser: function deser(_ref) { + var s = _ref[0]; + return post(parseDigits(s)); + } + }; + } + + function fixListRegex(s) { + // make dots optional and also make them literal + return s.replace(/\./, "\\.?"); + } + + function stripInsensitivities(s) { + return s.replace(/\./, "").toLowerCase(); + } + + function oneOf(strings, startIndex) { + if (strings === null) { + return null; + } else { + return { + regex: RegExp(strings.map(fixListRegex).join("|")), + deser: function deser(_ref2) { + var s = _ref2[0]; + return strings.findIndex(function (i) { + return stripInsensitivities(s) === stripInsensitivities(i); + }) + startIndex; + } + }; + } + } + + function offset(regex, groups) { + return { + regex: regex, + deser: function deser(_ref3) { + var h = _ref3[1], + m = _ref3[2]; + return signedOffset(h, m); + }, + groups: groups + }; + } + + function simple(regex) { + return { + regex: regex, + deser: function deser(_ref4) { + var s = _ref4[0]; + return s; + } + }; + } + + function escapeToken(value) { + // eslint-disable-next-line no-useless-escape + return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&"); + } + + function unitForToken(token, loc) { + var one = digitRegex(loc), + two = digitRegex(loc, "{2}"), + three = digitRegex(loc, "{3}"), + four = digitRegex(loc, "{4}"), + six = digitRegex(loc, "{6}"), + oneOrTwo = digitRegex(loc, "{1,2}"), + oneToThree = digitRegex(loc, "{1,3}"), + oneToSix = digitRegex(loc, "{1,6}"), + oneToNine = digitRegex(loc, "{1,9}"), + twoToFour = digitRegex(loc, "{2,4}"), + fourToSix = digitRegex(loc, "{4,6}"), + literal = function literal(t) { + return { + regex: RegExp(escapeToken(t.val)), + deser: function deser(_ref5) { + var s = _ref5[0]; + return s; + }, + literal: true + }; + }, + unitate = function unitate(t) { + if (token.literal) { + return literal(t); + } + + switch (t.val) { + // era + case "G": + return oneOf(loc.eras("short", false), 0); + + case "GG": + return oneOf(loc.eras("long", false), 0); + // years + + case "y": + return intUnit(oneToSix); + + case "yy": + return intUnit(twoToFour, untruncateYear); + + case "yyyy": + return intUnit(four); + + case "yyyyy": + return intUnit(fourToSix); + + case "yyyyyy": + return intUnit(six); + // months + + case "M": + return intUnit(oneOrTwo); + + case "MM": + return intUnit(two); + + case "MMM": + return oneOf(loc.months("short", true, false), 1); + + case "MMMM": + return oneOf(loc.months("long", true, false), 1); + + case "L": + return intUnit(oneOrTwo); + + case "LL": + return intUnit(two); + + case "LLL": + return oneOf(loc.months("short", false, false), 1); + + case "LLLL": + return oneOf(loc.months("long", false, false), 1); + // dates + + case "d": + return intUnit(oneOrTwo); + + case "dd": + return intUnit(two); + // ordinals + + case "o": + return intUnit(oneToThree); + + case "ooo": + return intUnit(three); + // time + + case "HH": + return intUnit(two); + + case "H": + return intUnit(oneOrTwo); + + case "hh": + return intUnit(two); + + case "h": + return intUnit(oneOrTwo); + + case "mm": + return intUnit(two); + + case "m": + return intUnit(oneOrTwo); + + case "s": + return intUnit(oneOrTwo); + + case "ss": + return intUnit(two); + + case "S": + return intUnit(oneToThree); + + case "SSS": + return intUnit(three); + + case "u": + return simple(oneToNine); + // meridiem + + case "a": + return oneOf(loc.meridiems(), 0); + // weekYear (k) + + case "kkkk": + return intUnit(four); + + case "kk": + return intUnit(twoToFour, untruncateYear); + // weekNumber (W) + + case "W": + return intUnit(oneOrTwo); + + case "WW": + return intUnit(two); + // weekdays + + case "E": + case "c": + return intUnit(one); + + case "EEE": + return oneOf(loc.weekdays("short", false, false), 1); + + case "EEEE": + return oneOf(loc.weekdays("long", false, false), 1); + + case "ccc": + return oneOf(loc.weekdays("short", true, false), 1); + + case "cccc": + return oneOf(loc.weekdays("long", true, false), 1); + // offset/zone + + case "Z": + case "ZZ": + return offset(new RegExp("([+-]" + oneOrTwo.source + ")(?::(" + two.source + "))?"), 2); + + case "ZZZ": + return offset(new RegExp("([+-]" + oneOrTwo.source + ")(" + two.source + ")?"), 2); + // we don't support ZZZZ (PST) or ZZZZZ (Pacific Standard Time) in parsing + // because we don't have any way to figure out what they are + + case "z": + return simple(/[a-z_+-/]{1,256}?/i); + + default: + return literal(t); + } + }; + + var unit = unitate(token) || { + invalidReason: MISSING_FTP + }; + unit.token = token; + return unit; + } + + var partTypeStyleToTokenVal = { + year: { + "2-digit": "yy", + numeric: "yyyyy" + }, + month: { + numeric: "M", + "2-digit": "MM", + short: "MMM", + long: "MMMM" + }, + day: { + numeric: "d", + "2-digit": "dd" + }, + weekday: { + short: "EEE", + long: "EEEE" + }, + dayperiod: "a", + hour: { + numeric: "h", + "2-digit": "hh" + }, + minute: { + numeric: "m", + "2-digit": "mm" + }, + second: { + numeric: "s", + "2-digit": "ss" + } + }; + + function tokenForPart(part, locale, formatOpts) { + var type = part.type, + value = part.value; + + if (type === "literal") { + return { + literal: true, + val: value + }; + } + + var style = formatOpts[type]; + var val = partTypeStyleToTokenVal[type]; + + if (typeof val === "object") { + val = val[style]; + } + + if (val) { + return { + literal: false, + val: val + }; + } + + return undefined; + } + + function buildRegex(units) { + var re = units.map(function (u) { + return u.regex; + }).reduce(function (f, r) { + return f + "(" + r.source + ")"; + }, ""); + return ["^" + re + "$", units]; + } + + function match(input, regex, handlers) { + var matches = input.match(regex); + + if (matches) { + var all = {}; + var matchIndex = 1; + + for (var i in handlers) { + if (hasOwnProperty(handlers, i)) { + var h = handlers[i], + groups = h.groups ? h.groups + 1 : 1; + + if (!h.literal && h.token) { + all[h.token.val[0]] = h.deser(matches.slice(matchIndex, matchIndex + groups)); + } + + matchIndex += groups; + } + } + + return [matches, all]; + } else { + return [matches, {}]; + } + } + + function dateTimeFromMatches(matches) { + var toField = function toField(token) { + switch (token) { + case "S": + return "millisecond"; + + case "s": + return "second"; + + case "m": + return "minute"; + + case "h": + case "H": + return "hour"; + + case "d": + return "day"; + + case "o": + return "ordinal"; + + case "L": + case "M": + return "month"; + + case "y": + return "year"; + + case "E": + case "c": + return "weekday"; + + case "W": + return "weekNumber"; + + case "k": + return "weekYear"; + + default: + return null; + } + }; + + var zone; + + if (!isUndefined(matches.Z)) { + zone = new FixedOffsetZone(matches.Z); + } else if (!isUndefined(matches.z)) { + zone = IANAZone.create(matches.z); + } else { + zone = null; + } + + if (!isUndefined(matches.h)) { + if (matches.h < 12 && matches.a === 1) { + matches.h += 12; + } else if (matches.h === 12 && matches.a === 0) { + matches.h = 0; + } + } + + if (matches.G === 0 && matches.y) { + matches.y = -matches.y; + } + + if (!isUndefined(matches.u)) { + matches.S = parseMillis(matches.u); + } + + var vals = Object.keys(matches).reduce(function (r, k) { + var f = toField(k); + + if (f) { + r[f] = matches[k]; + } + + return r; + }, {}); + return [vals, zone]; + } + + var dummyDateTimeCache = null; + + function getDummyDateTime() { + if (!dummyDateTimeCache) { + dummyDateTimeCache = DateTime.fromMillis(1555555555555); + } + + return dummyDateTimeCache; + } + + function maybeExpandMacroToken(token, locale) { + if (token.literal) { + return token; + } + + var formatOpts = Formatter.macroTokenToFormatOpts(token.val); + + if (!formatOpts) { + return token; + } + + var formatter = Formatter.create(locale, formatOpts); + var parts = formatter.formatDateTimeParts(getDummyDateTime()); + var tokens = parts.map(function (p) { + return tokenForPart(p, locale, formatOpts); + }); + + if (tokens.includes(undefined)) { + return token; + } + + return tokens; + } + + function expandMacroTokens(tokens, locale) { + var _Array$prototype; + + return (_Array$prototype = Array.prototype).concat.apply(_Array$prototype, tokens.map(function (t) { + return maybeExpandMacroToken(t, locale); + })); + } + /** + * @private + */ + + + function explainFromTokens(locale, input, format) { + var tokens = expandMacroTokens(Formatter.parseFormat(format), locale), + units = tokens.map(function (t) { + return unitForToken(t, locale); + }), + disqualifyingUnit = units.find(function (t) { + return t.invalidReason; + }); + + if (disqualifyingUnit) { + return { + input: input, + tokens: tokens, + invalidReason: disqualifyingUnit.invalidReason + }; + } else { + var _buildRegex = buildRegex(units), + regexString = _buildRegex[0], + handlers = _buildRegex[1], + regex = RegExp(regexString, "i"), + _match = match(input, regex, handlers), + rawMatches = _match[0], + matches = _match[1], + _ref6 = matches ? dateTimeFromMatches(matches) : [null, null], + result = _ref6[0], + zone = _ref6[1]; + + return { + input: input, + tokens: tokens, + regex: regex, + rawMatches: rawMatches, + matches: matches, + result: result, + zone: zone + }; + } + } + function parseFromTokens(locale, input, format) { + var _explainFromTokens = explainFromTokens(locale, input, format), + result = _explainFromTokens.result, + zone = _explainFromTokens.zone, + invalidReason = _explainFromTokens.invalidReason; + + return [result, zone, invalidReason]; + } + + var nonLeapLadder = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334], + leapLadder = [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335]; + + function unitOutOfRange(unit, value) { + return new Invalid("unit out of range", "you specified " + value + " (of type " + typeof value + ") as a " + unit + ", which is invalid"); + } + + function dayOfWeek(year, month, day) { + var js = new Date(Date.UTC(year, month - 1, day)).getUTCDay(); + return js === 0 ? 7 : js; + } + + function computeOrdinal(year, month, day) { + return day + (isLeapYear(year) ? leapLadder : nonLeapLadder)[month - 1]; + } + + function uncomputeOrdinal(year, ordinal) { + var table = isLeapYear(year) ? leapLadder : nonLeapLadder, + month0 = table.findIndex(function (i) { + return i < ordinal; + }), + day = ordinal - table[month0]; + return { + month: month0 + 1, + day: day + }; + } + /** + * @private + */ + + + function gregorianToWeek(gregObj) { + var year = gregObj.year, + month = gregObj.month, + day = gregObj.day, + ordinal = computeOrdinal(year, month, day), + weekday = dayOfWeek(year, month, day); + var weekNumber = Math.floor((ordinal - weekday + 10) / 7), + weekYear; + + if (weekNumber < 1) { + weekYear = year - 1; + weekNumber = weeksInWeekYear(weekYear); + } else if (weekNumber > weeksInWeekYear(year)) { + weekYear = year + 1; + weekNumber = 1; + } else { + weekYear = year; + } + + return Object.assign({ + weekYear: weekYear, + weekNumber: weekNumber, + weekday: weekday + }, timeObject(gregObj)); + } + function weekToGregorian(weekData) { + var weekYear = weekData.weekYear, + weekNumber = weekData.weekNumber, + weekday = weekData.weekday, + weekdayOfJan4 = dayOfWeek(weekYear, 1, 4), + yearInDays = daysInYear(weekYear); + var ordinal = weekNumber * 7 + weekday - weekdayOfJan4 - 3, + year; + + if (ordinal < 1) { + year = weekYear - 1; + ordinal += daysInYear(year); + } else if (ordinal > yearInDays) { + year = weekYear + 1; + ordinal -= daysInYear(weekYear); + } else { + year = weekYear; + } + + var _uncomputeOrdinal = uncomputeOrdinal(year, ordinal), + month = _uncomputeOrdinal.month, + day = _uncomputeOrdinal.day; + + return Object.assign({ + year: year, + month: month, + day: day + }, timeObject(weekData)); + } + function gregorianToOrdinal(gregData) { + var year = gregData.year, + month = gregData.month, + day = gregData.day, + ordinal = computeOrdinal(year, month, day); + return Object.assign({ + year: year, + ordinal: ordinal + }, timeObject(gregData)); + } + function ordinalToGregorian(ordinalData) { + var year = ordinalData.year, + ordinal = ordinalData.ordinal, + _uncomputeOrdinal2 = uncomputeOrdinal(year, ordinal), + month = _uncomputeOrdinal2.month, + day = _uncomputeOrdinal2.day; + + return Object.assign({ + year: year, + month: month, + day: day + }, timeObject(ordinalData)); + } + function hasInvalidWeekData(obj) { + var validYear = isInteger(obj.weekYear), + validWeek = integerBetween(obj.weekNumber, 1, weeksInWeekYear(obj.weekYear)), + validWeekday = integerBetween(obj.weekday, 1, 7); + + if (!validYear) { + return unitOutOfRange("weekYear", obj.weekYear); + } else if (!validWeek) { + return unitOutOfRange("week", obj.week); + } else if (!validWeekday) { + return unitOutOfRange("weekday", obj.weekday); + } else return false; + } + function hasInvalidOrdinalData(obj) { + var validYear = isInteger(obj.year), + validOrdinal = integerBetween(obj.ordinal, 1, daysInYear(obj.year)); + + if (!validYear) { + return unitOutOfRange("year", obj.year); + } else if (!validOrdinal) { + return unitOutOfRange("ordinal", obj.ordinal); + } else return false; + } + function hasInvalidGregorianData(obj) { + var validYear = isInteger(obj.year), + validMonth = integerBetween(obj.month, 1, 12), + validDay = integerBetween(obj.day, 1, daysInMonth(obj.year, obj.month)); + + if (!validYear) { + return unitOutOfRange("year", obj.year); + } else if (!validMonth) { + return unitOutOfRange("month", obj.month); + } else if (!validDay) { + return unitOutOfRange("day", obj.day); + } else return false; + } + function hasInvalidTimeData(obj) { + var hour = obj.hour, + minute = obj.minute, + second = obj.second, + millisecond = obj.millisecond; + var validHour = integerBetween(hour, 0, 23) || hour === 24 && minute === 0 && second === 0 && millisecond === 0, + validMinute = integerBetween(minute, 0, 59), + validSecond = integerBetween(second, 0, 59), + validMillisecond = integerBetween(millisecond, 0, 999); + + if (!validHour) { + return unitOutOfRange("hour", hour); + } else if (!validMinute) { + return unitOutOfRange("minute", minute); + } else if (!validSecond) { + return unitOutOfRange("second", second); + } else if (!validMillisecond) { + return unitOutOfRange("millisecond", millisecond); + } else return false; + } + + var INVALID$2 = "Invalid DateTime"; + var MAX_DATE = 8.64e15; + + function unsupportedZone(zone) { + return new Invalid("unsupported zone", "the zone \"" + zone.name + "\" is not supported"); + } // we cache week data on the DT object and this intermediates the cache + + + function possiblyCachedWeekData(dt) { + if (dt.weekData === null) { + dt.weekData = gregorianToWeek(dt.c); + } + + return dt.weekData; + } // clone really means, "make a new object with these modifications". all "setters" really use this + // to create a new object while only changing some of the properties + + + function clone$1(inst, alts) { + var current = { + ts: inst.ts, + zone: inst.zone, + c: inst.c, + o: inst.o, + loc: inst.loc, + invalid: inst.invalid + }; + return new DateTime(Object.assign({}, current, alts, { + old: current + })); + } // find the right offset a given local time. The o input is our guess, which determines which + // offset we'll pick in ambiguous cases (e.g. there are two 3 AMs b/c Fallback DST) + + + function fixOffset(localTS, o, tz) { + // Our UTC time is just a guess because our offset is just a guess + var utcGuess = localTS - o * 60 * 1000; // Test whether the zone matches the offset for this ts + + var o2 = tz.offset(utcGuess); // If so, offset didn't change and we're done + + if (o === o2) { + return [utcGuess, o]; + } // If not, change the ts by the difference in the offset + + + utcGuess -= (o2 - o) * 60 * 1000; // If that gives us the local time we want, we're done + + var o3 = tz.offset(utcGuess); + + if (o2 === o3) { + return [utcGuess, o2]; + } // If it's different, we're in a hole time. The offset has changed, but the we don't adjust the time + + + return [localTS - Math.min(o2, o3) * 60 * 1000, Math.max(o2, o3)]; + } // convert an epoch timestamp into a calendar object with the given offset + + + function tsToObj(ts, offset) { + ts += offset * 60 * 1000; + var d = new Date(ts); + return { + year: d.getUTCFullYear(), + month: d.getUTCMonth() + 1, + day: d.getUTCDate(), + hour: d.getUTCHours(), + minute: d.getUTCMinutes(), + second: d.getUTCSeconds(), + millisecond: d.getUTCMilliseconds() + }; + } // convert a calendar object to a epoch timestamp + + + function objToTS(obj, offset, zone) { + return fixOffset(objToLocalTS(obj), offset, zone); + } // create a new DT instance by adding a duration, adjusting for DSTs + + + function adjustTime(inst, dur) { + var _dur; + + var keys = Object.keys(dur.values); + + if (keys.indexOf("milliseconds") === -1) { + keys.push("milliseconds"); + } + + dur = (_dur = dur).shiftTo.apply(_dur, keys); + var oPre = inst.o, + year = inst.c.year + dur.years, + month = inst.c.month + dur.months + dur.quarters * 3, + c = Object.assign({}, inst.c, { + year: year, + month: month, + day: Math.min(inst.c.day, daysInMonth(year, month)) + dur.days + dur.weeks * 7 + }), + millisToAdd = Duration.fromObject({ + hours: dur.hours, + minutes: dur.minutes, + seconds: dur.seconds, + milliseconds: dur.milliseconds + }).as("milliseconds"), + localTS = objToLocalTS(c); + + var _fixOffset = fixOffset(localTS, oPre, inst.zone), + ts = _fixOffset[0], + o = _fixOffset[1]; + + if (millisToAdd !== 0) { + ts += millisToAdd; // that could have changed the offset by going over a DST, but we want to keep the ts the same + + o = inst.zone.offset(ts); + } + + return { + ts: ts, + o: o + }; + } // helper useful in turning the results of parsing into real dates + // by handling the zone options + + + function parseDataToDateTime(parsed, parsedZone, opts, format, text) { + var setZone = opts.setZone, + zone = opts.zone; + + if (parsed && Object.keys(parsed).length !== 0) { + var interpretationZone = parsedZone || zone, + inst = DateTime.fromObject(Object.assign(parsed, opts, { + zone: interpretationZone, + // setZone is a valid option in the calling methods, but not in fromObject + setZone: undefined + })); + return setZone ? inst : inst.setZone(zone); + } else { + return DateTime.invalid(new Invalid("unparsable", "the input \"" + text + "\" can't be parsed as " + format)); + } + } // if you want to output a technical format (e.g. RFC 2822), this helper + // helps handle the details + + + function toTechFormat(dt, format) { + return dt.isValid ? Formatter.create(Locale.create("en-US"), { + allowZ: true, + forceSimple: true + }).formatDateTimeFromString(dt, format) : null; + } // technical time formats (e.g. the time part of ISO 8601), take some options + // and this commonizes their handling + + + function toTechTimeFormat(dt, _ref) { + var _ref$suppressSeconds = _ref.suppressSeconds, + suppressSeconds = _ref$suppressSeconds === void 0 ? false : _ref$suppressSeconds, + _ref$suppressMillisec = _ref.suppressMilliseconds, + suppressMilliseconds = _ref$suppressMillisec === void 0 ? false : _ref$suppressMillisec, + includeOffset = _ref.includeOffset, + _ref$includeZone = _ref.includeZone, + includeZone = _ref$includeZone === void 0 ? false : _ref$includeZone, + _ref$spaceZone = _ref.spaceZone, + spaceZone = _ref$spaceZone === void 0 ? false : _ref$spaceZone; + var fmt = "HH:mm"; + + if (!suppressSeconds || dt.second !== 0 || dt.millisecond !== 0) { + fmt += ":ss"; + + if (!suppressMilliseconds || dt.millisecond !== 0) { + fmt += ".SSS"; + } + } + + if ((includeZone || includeOffset) && spaceZone) { + fmt += " "; + } + + if (includeZone) { + fmt += "z"; + } else if (includeOffset) { + fmt += "ZZ"; + } + + return toTechFormat(dt, fmt); + } // defaults for unspecified units in the supported calendars + + + var defaultUnitValues = { + month: 1, + day: 1, + hour: 0, + minute: 0, + second: 0, + millisecond: 0 + }, + defaultWeekUnitValues = { + weekNumber: 1, + weekday: 1, + hour: 0, + minute: 0, + second: 0, + millisecond: 0 + }, + defaultOrdinalUnitValues = { + ordinal: 1, + hour: 0, + minute: 0, + second: 0, + millisecond: 0 + }; // Units in the supported calendars, sorted by bigness + + var orderedUnits$1 = ["year", "month", "day", "hour", "minute", "second", "millisecond"], + orderedWeekUnits = ["weekYear", "weekNumber", "weekday", "hour", "minute", "second", "millisecond"], + orderedOrdinalUnits = ["year", "ordinal", "hour", "minute", "second", "millisecond"]; // standardize case and plurality in units + + function normalizeUnit(unit) { + var normalized = { + year: "year", + years: "year", + month: "month", + months: "month", + day: "day", + days: "day", + hour: "hour", + hours: "hour", + minute: "minute", + minutes: "minute", + second: "second", + seconds: "second", + millisecond: "millisecond", + milliseconds: "millisecond", + weekday: "weekday", + weekdays: "weekday", + weeknumber: "weekNumber", + weeksnumber: "weekNumber", + weeknumbers: "weekNumber", + weekyear: "weekYear", + weekyears: "weekYear", + ordinal: "ordinal" + }[unit.toLowerCase()]; + if (!normalized) throw new InvalidUnitError(unit); + return normalized; + } // this is a dumbed down version of fromObject() that runs about 60% faster + // but doesn't do any validation, makes a bunch of assumptions about what units + // are present, and so on. + + + function quickDT(obj, zone) { + // assume we have the higher-order units + for (var _i = 0, _orderedUnits = orderedUnits$1; _i < _orderedUnits.length; _i++) { + var u = _orderedUnits[_i]; + + if (isUndefined(obj[u])) { + obj[u] = defaultUnitValues[u]; + } + } + + var invalid = hasInvalidGregorianData(obj) || hasInvalidTimeData(obj); + + if (invalid) { + return DateTime.invalid(invalid); + } + + var tsNow = Settings.now(), + offsetProvis = zone.offset(tsNow), + _objToTS = objToTS(obj, offsetProvis, zone), + ts = _objToTS[0], + o = _objToTS[1]; + + return new DateTime({ + ts: ts, + zone: zone, + o: o + }); + } + + function diffRelative(start, end, opts) { + var round = isUndefined(opts.round) ? true : opts.round, + format = function format(c, unit) { + c = roundTo(c, round || opts.calendary ? 0 : 2, true); + var formatter = end.loc.clone(opts).relFormatter(opts); + return formatter.format(c, unit); + }, + differ = function differ(unit) { + if (opts.calendary) { + if (!end.hasSame(start, unit)) { + return end.startOf(unit).diff(start.startOf(unit), unit).get(unit); + } else return 0; + } else { + return end.diff(start, unit).get(unit); + } + }; + + if (opts.unit) { + return format(differ(opts.unit), opts.unit); + } + + for (var _iterator = opts.units, _isArray = Array.isArray(_iterator), _i2 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) { + var _ref2; + + if (_isArray) { + if (_i2 >= _iterator.length) break; + _ref2 = _iterator[_i2++]; + } else { + _i2 = _iterator.next(); + if (_i2.done) break; + _ref2 = _i2.value; + } + + var unit = _ref2; + var count = differ(unit); + + if (Math.abs(count) >= 1) { + return format(count, unit); + } + } + + return format(0, opts.units[opts.units.length - 1]); + } + /** + * A DateTime is an immutable data structure representing a specific date and time and accompanying methods. It contains class and instance methods for creating, parsing, interrogating, transforming, and formatting them. + * + * A DateTime comprises of: + * * A timestamp. Each DateTime instance refers to a specific millisecond of the Unix epoch. + * * A time zone. Each instance is considered in the context of a specific zone (by default the local system's zone). + * * Configuration properties that effect how output strings are formatted, such as `locale`, `numberingSystem`, and `outputCalendar`. + * + * Here is a brief overview of the most commonly used functionality it provides: + * + * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link local}, {@link utc}, and (most flexibly) {@link fromObject}. To create one from a standard string format, use {@link fromISO}, {@link fromHTTP}, and {@link fromRFC2822}. To create one from a custom string format, use {@link fromFormat}. To create one from a native JS date, use {@link fromJSDate}. + * * **Gregorian calendar and time**: To examine the Gregorian properties of a DateTime individually (i.e as opposed to collectively through {@link toObject}), use the {@link year}, {@link month}, + * {@link day}, {@link hour}, {@link minute}, {@link second}, {@link millisecond} accessors. + * * **Week calendar**: For ISO week calendar attributes, see the {@link weekYear}, {@link weekNumber}, and {@link weekday} accessors. + * * **Configuration** See the {@link locale} and {@link numberingSystem} accessors. + * * **Transformation**: To transform the DateTime into other DateTimes, use {@link set}, {@link reconfigure}, {@link setZone}, {@link setLocale}, {@link plus}, {@link minus}, {@link endOf}, {@link startOf}, {@link toUTC}, and {@link toLocal}. + * * **Output**: To convert the DateTime to other representations, use the {@link toRelative}, {@link toRelativeCalendar}, {@link toJSON}, {@link toISO}, {@link toHTTP}, {@link toObject}, {@link toRFC2822}, {@link toString}, {@link toLocaleString}, {@link toFormat}, {@link toMillis} and {@link toJSDate}. + * + * There's plenty others documented below. In addition, for more information on subtler topics like internationalization, time zones, alternative calendars, validity, and so on, see the external documentation. + */ + + + var DateTime = + /*#__PURE__*/ + function () { + /** + * @access private + */ + function DateTime(config) { + var zone = config.zone || Settings.defaultZone; + var invalid = config.invalid || (Number.isNaN(config.ts) ? new Invalid("invalid input") : null) || (!zone.isValid ? unsupportedZone(zone) : null); + /** + * @access private + */ + + this.ts = isUndefined(config.ts) ? Settings.now() : config.ts; + var c = null, + o = null; + + if (!invalid) { + var unchanged = config.old && config.old.ts === this.ts && config.old.zone.equals(zone); + + if (unchanged) { + var _ref3 = [config.old.c, config.old.o]; + c = _ref3[0]; + o = _ref3[1]; + } else { + c = tsToObj(this.ts, zone.offset(this.ts)); + invalid = Number.isNaN(c.year) ? new Invalid("invalid input") : null; + c = invalid ? null : c; + o = invalid ? null : zone.offset(this.ts); + } + } + /** + * @access private + */ + + + this._zone = zone; + /** + * @access private + */ + + this.loc = config.loc || Locale.create(); + /** + * @access private + */ + + this.invalid = invalid; + /** + * @access private + */ + + this.weekData = null; + /** + * @access private + */ + + this.c = c; + /** + * @access private + */ + + this.o = o; + /** + * @access private + */ + + this.isLuxonDateTime = true; + } // CONSTRUCT + + /** + * Create a local DateTime + * @param {number} [year] - The calendar year. If omitted (as in, call `local()` with no arguments), the current time will be used + * @param {number} [month=1] - The month, 1-indexed + * @param {number} [day=1] - The day of the month + * @param {number} [hour=0] - The hour of the day, in 24-hour time + * @param {number} [minute=0] - The minute of the hour, i.e. a number between 0 and 59 + * @param {number} [second=0] - The second of the minute, i.e. a number between 0 and 59 + * @param {number} [millisecond=0] - The millisecond of the second, i.e. a number between 0 and 999 + * @example DateTime.local() //~> now + * @example DateTime.local(2017) //~> 2017-01-01T00:00:00 + * @example DateTime.local(2017, 3) //~> 2017-03-01T00:00:00 + * @example DateTime.local(2017, 3, 12) //~> 2017-03-12T00:00:00 + * @example DateTime.local(2017, 3, 12, 5) //~> 2017-03-12T05:00:00 + * @example DateTime.local(2017, 3, 12, 5, 45) //~> 2017-03-12T05:45:00 + * @example DateTime.local(2017, 3, 12, 5, 45, 10) //~> 2017-03-12T05:45:10 + * @example DateTime.local(2017, 3, 12, 5, 45, 10, 765) //~> 2017-03-12T05:45:10.765 + * @return {DateTime} + */ + + + DateTime.local = function local(year, month, day, hour, minute, second, millisecond) { + if (isUndefined(year)) { + return new DateTime({ + ts: Settings.now() + }); + } else { + return quickDT({ + year: year, + month: month, + day: day, + hour: hour, + minute: minute, + second: second, + millisecond: millisecond + }, Settings.defaultZone); + } + } + /** + * Create a DateTime in UTC + * @param {number} [year] - The calendar year. If omitted (as in, call `utc()` with no arguments), the current time will be used + * @param {number} [month=1] - The month, 1-indexed + * @param {number} [day=1] - The day of the month + * @param {number} [hour=0] - The hour of the day, in 24-hour time + * @param {number} [minute=0] - The minute of the hour, i.e. a number between 0 and 59 + * @param {number} [second=0] - The second of the minute, i.e. a number between 0 and 59 + * @param {number} [millisecond=0] - The millisecond of the second, i.e. a number between 0 and 999 + * @example DateTime.utc() //~> now + * @example DateTime.utc(2017) //~> 2017-01-01T00:00:00Z + * @example DateTime.utc(2017, 3) //~> 2017-03-01T00:00:00Z + * @example DateTime.utc(2017, 3, 12) //~> 2017-03-12T00:00:00Z + * @example DateTime.utc(2017, 3, 12, 5) //~> 2017-03-12T05:00:00Z + * @example DateTime.utc(2017, 3, 12, 5, 45) //~> 2017-03-12T05:45:00Z + * @example DateTime.utc(2017, 3, 12, 5, 45, 10) //~> 2017-03-12T05:45:10Z + * @example DateTime.utc(2017, 3, 12, 5, 45, 10, 765) //~> 2017-03-12T05:45:10.765Z + * @return {DateTime} + */ + ; + + DateTime.utc = function utc(year, month, day, hour, minute, second, millisecond) { + if (isUndefined(year)) { + return new DateTime({ + ts: Settings.now(), + zone: FixedOffsetZone.utcInstance + }); + } else { + return quickDT({ + year: year, + month: month, + day: day, + hour: hour, + minute: minute, + second: second, + millisecond: millisecond + }, FixedOffsetZone.utcInstance); + } + } + /** + * Create a DateTime from a Javascript Date object. Uses the default zone. + * @param {Date} date - a Javascript Date object + * @param {Object} options - configuration options for the DateTime + * @param {string|Zone} [options.zone='local'] - the zone to place the DateTime into + * @return {DateTime} + */ + ; + + DateTime.fromJSDate = function fromJSDate(date, options) { + if (options === void 0) { + options = {}; + } + + var ts = isDate(date) ? date.valueOf() : NaN; + + if (Number.isNaN(ts)) { + return DateTime.invalid("invalid input"); + } + + var zoneToUse = normalizeZone(options.zone, Settings.defaultZone); + + if (!zoneToUse.isValid) { + return DateTime.invalid(unsupportedZone(zoneToUse)); + } + + return new DateTime({ + ts: ts, + zone: zoneToUse, + loc: Locale.fromObject(options) + }); + } + /** + * Create a DateTime from a number of milliseconds since the epoch (i.e. since 1 January 1970 00:00:00 UTC). Uses the default zone. + * @param {number} milliseconds - a number of milliseconds since 1970 UTC + * @param {Object} options - configuration options for the DateTime + * @param {string|Zone} [options.zone='local'] - the zone to place the DateTime into + * @param {string} [options.locale] - a locale to set on the resulting DateTime instance + * @param {string} options.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} options.numberingSystem - the numbering system to set on the resulting DateTime instance + * @return {DateTime} + */ + ; + + DateTime.fromMillis = function fromMillis(milliseconds, options) { + if (options === void 0) { + options = {}; + } + + if (!isNumber(milliseconds)) { + throw new InvalidArgumentError("fromMillis requires a numerical input"); + } else if (milliseconds < -MAX_DATE || milliseconds > MAX_DATE) { + // this isn't perfect because because we can still end up out of range because of additional shifting, but it's a start + return DateTime.invalid("Timestamp out of range"); + } else { + return new DateTime({ + ts: milliseconds, + zone: normalizeZone(options.zone, Settings.defaultZone), + loc: Locale.fromObject(options) + }); + } + } + /** + * Create a DateTime from a number of seconds since the epoch (i.e. since 1 January 1970 00:00:00 UTC). Uses the default zone. + * @param {number} seconds - a number of seconds since 1970 UTC + * @param {Object} options - configuration options for the DateTime + * @param {string|Zone} [options.zone='local'] - the zone to place the DateTime into + * @param {string} [options.locale] - a locale to set on the resulting DateTime instance + * @param {string} options.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} options.numberingSystem - the numbering system to set on the resulting DateTime instance + * @return {DateTime} + */ + ; + + DateTime.fromSeconds = function fromSeconds(seconds, options) { + if (options === void 0) { + options = {}; + } + + if (!isNumber(seconds)) { + throw new InvalidArgumentError("fromSeconds requires a numerical input"); + } else { + return new DateTime({ + ts: seconds * 1000, + zone: normalizeZone(options.zone, Settings.defaultZone), + loc: Locale.fromObject(options) + }); + } + } + /** + * Create a DateTime from a Javascript object with keys like 'year' and 'hour' with reasonable defaults. + * @param {Object} obj - the object to create the DateTime from + * @param {number} obj.year - a year, such as 1987 + * @param {number} obj.month - a month, 1-12 + * @param {number} obj.day - a day of the month, 1-31, depending on the month + * @param {number} obj.ordinal - day of the year, 1-365 or 366 + * @param {number} obj.weekYear - an ISO week year + * @param {number} obj.weekNumber - an ISO week number, between 1 and 52 or 53, depending on the year + * @param {number} obj.weekday - an ISO weekday, 1-7, where 1 is Monday and 7 is Sunday + * @param {number} obj.hour - hour of the day, 0-23 + * @param {number} obj.minute - minute of the hour, 0-59 + * @param {number} obj.second - second of the minute, 0-59 + * @param {number} obj.millisecond - millisecond of the second, 0-999 + * @param {string|Zone} [obj.zone='local'] - interpret the numbers in the context of a particular zone. Can take any value taken as the first argument to setZone() + * @param {string} [obj.locale='system's locale'] - a locale to set on the resulting DateTime instance + * @param {string} obj.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} obj.numberingSystem - the numbering system to set on the resulting DateTime instance + * @example DateTime.fromObject({ year: 1982, month: 5, day: 25}).toISODate() //=> '1982-05-25' + * @example DateTime.fromObject({ year: 1982 }).toISODate() //=> '1982-01-01' + * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6 }) //~> today at 10:26:06 + * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6, zone: 'utc' }), + * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6, zone: 'local' }) + * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6, zone: 'America/New_York' }) + * @example DateTime.fromObject({ weekYear: 2016, weekNumber: 2, weekday: 3 }).toISODate() //=> '2016-01-13' + * @return {DateTime} + */ + ; + + DateTime.fromObject = function fromObject(obj) { + var zoneToUse = normalizeZone(obj.zone, Settings.defaultZone); + + if (!zoneToUse.isValid) { + return DateTime.invalid(unsupportedZone(zoneToUse)); + } + + var tsNow = Settings.now(), + offsetProvis = zoneToUse.offset(tsNow), + normalized = normalizeObject(obj, normalizeUnit, ["zone", "locale", "outputCalendar", "numberingSystem"]), + containsOrdinal = !isUndefined(normalized.ordinal), + containsGregorYear = !isUndefined(normalized.year), + containsGregorMD = !isUndefined(normalized.month) || !isUndefined(normalized.day), + containsGregor = containsGregorYear || containsGregorMD, + definiteWeekDef = normalized.weekYear || normalized.weekNumber, + loc = Locale.fromObject(obj); // cases: + // just a weekday -> this week's instance of that weekday, no worries + // (gregorian data or ordinal) + (weekYear or weekNumber) -> error + // (gregorian month or day) + ordinal -> error + // otherwise just use weeks or ordinals or gregorian, depending on what's specified + + if ((containsGregor || containsOrdinal) && definiteWeekDef) { + throw new ConflictingSpecificationError("Can't mix weekYear/weekNumber units with year/month/day or ordinals"); + } + + if (containsGregorMD && containsOrdinal) { + throw new ConflictingSpecificationError("Can't mix ordinal dates with month/day"); + } + + var useWeekData = definiteWeekDef || normalized.weekday && !containsGregor; // configure ourselves to deal with gregorian dates or week stuff + + var units, + defaultValues, + objNow = tsToObj(tsNow, offsetProvis); + + if (useWeekData) { + units = orderedWeekUnits; + defaultValues = defaultWeekUnitValues; + objNow = gregorianToWeek(objNow); + } else if (containsOrdinal) { + units = orderedOrdinalUnits; + defaultValues = defaultOrdinalUnitValues; + objNow = gregorianToOrdinal(objNow); + } else { + units = orderedUnits$1; + defaultValues = defaultUnitValues; + } // set default values for missing stuff + + + var foundFirst = false; + + for (var _iterator2 = units, _isArray2 = Array.isArray(_iterator2), _i3 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) { + var _ref4; + + if (_isArray2) { + if (_i3 >= _iterator2.length) break; + _ref4 = _iterator2[_i3++]; + } else { + _i3 = _iterator2.next(); + if (_i3.done) break; + _ref4 = _i3.value; + } + + var u = _ref4; + var v = normalized[u]; + + if (!isUndefined(v)) { + foundFirst = true; + } else if (foundFirst) { + normalized[u] = defaultValues[u]; + } else { + normalized[u] = objNow[u]; + } + } // make sure the values we have are in range + + + var higherOrderInvalid = useWeekData ? hasInvalidWeekData(normalized) : containsOrdinal ? hasInvalidOrdinalData(normalized) : hasInvalidGregorianData(normalized), + invalid = higherOrderInvalid || hasInvalidTimeData(normalized); + + if (invalid) { + return DateTime.invalid(invalid); + } // compute the actual time + + + var gregorian = useWeekData ? weekToGregorian(normalized) : containsOrdinal ? ordinalToGregorian(normalized) : normalized, + _objToTS2 = objToTS(gregorian, offsetProvis, zoneToUse), + tsFinal = _objToTS2[0], + offsetFinal = _objToTS2[1], + inst = new DateTime({ + ts: tsFinal, + zone: zoneToUse, + o: offsetFinal, + loc: loc + }); // gregorian data + weekday serves only to validate + + + if (normalized.weekday && containsGregor && obj.weekday !== inst.weekday) { + return DateTime.invalid("mismatched weekday", "you can't specify both a weekday of " + normalized.weekday + " and a date of " + inst.toISO()); + } + + return inst; + } + /** + * Create a DateTime from an ISO 8601 string + * @param {string} text - the ISO string + * @param {Object} opts - options to affect the creation + * @param {string|Zone} [opts.zone='local'] - use this zone if no offset is specified in the input string itself. Will also convert the time to this zone + * @param {boolean} [opts.setZone=false] - override the zone with a fixed-offset zone specified in the string itself, if it specifies one + * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance + * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance + * @example DateTime.fromISO('2016-05-25T09:08:34.123') + * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00') + * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00', {setZone: true}) + * @example DateTime.fromISO('2016-05-25T09:08:34.123', {zone: 'utc'}) + * @example DateTime.fromISO('2016-W05-4') + * @return {DateTime} + */ + ; + + DateTime.fromISO = function fromISO(text, opts) { + if (opts === void 0) { + opts = {}; + } + + var _parseISODate = parseISODate(text), + vals = _parseISODate[0], + parsedZone = _parseISODate[1]; + + return parseDataToDateTime(vals, parsedZone, opts, "ISO 8601", text); + } + /** + * Create a DateTime from an RFC 2822 string + * @param {string} text - the RFC 2822 string + * @param {Object} opts - options to affect the creation + * @param {string|Zone} [opts.zone='local'] - convert the time to this zone. Since the offset is always specified in the string itself, this has no effect on the interpretation of string, merely the zone the resulting DateTime is expressed in. + * @param {boolean} [opts.setZone=false] - override the zone with a fixed-offset zone specified in the string itself, if it specifies one + * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance + * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance + * @example DateTime.fromRFC2822('25 Nov 2016 13:23:12 GMT') + * @example DateTime.fromRFC2822('Fri, 25 Nov 2016 13:23:12 +0600') + * @example DateTime.fromRFC2822('25 Nov 2016 13:23 Z') + * @return {DateTime} + */ + ; + + DateTime.fromRFC2822 = function fromRFC2822(text, opts) { + if (opts === void 0) { + opts = {}; + } + + var _parseRFC2822Date = parseRFC2822Date(text), + vals = _parseRFC2822Date[0], + parsedZone = _parseRFC2822Date[1]; + + return parseDataToDateTime(vals, parsedZone, opts, "RFC 2822", text); + } + /** + * Create a DateTime from an HTTP header date + * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3.1 + * @param {string} text - the HTTP header date + * @param {Object} opts - options to affect the creation + * @param {string|Zone} [opts.zone='local'] - convert the time to this zone. Since HTTP dates are always in UTC, this has no effect on the interpretation of string, merely the zone the resulting DateTime is expressed in. + * @param {boolean} [opts.setZone=false] - override the zone with the fixed-offset zone specified in the string. For HTTP dates, this is always UTC, so this option is equivalent to setting the `zone` option to 'utc', but this option is included for consistency with similar methods. + * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance + * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance + * @example DateTime.fromHTTP('Sun, 06 Nov 1994 08:49:37 GMT') + * @example DateTime.fromHTTP('Sunday, 06-Nov-94 08:49:37 GMT') + * @example DateTime.fromHTTP('Sun Nov 6 08:49:37 1994') + * @return {DateTime} + */ + ; + + DateTime.fromHTTP = function fromHTTP(text, opts) { + if (opts === void 0) { + opts = {}; + } + + var _parseHTTPDate = parseHTTPDate(text), + vals = _parseHTTPDate[0], + parsedZone = _parseHTTPDate[1]; + + return parseDataToDateTime(vals, parsedZone, opts, "HTTP", opts); + } + /** + * Create a DateTime from an input string and format string. + * Defaults to en-US if no locale has been specified, regardless of the system's locale. + * @see https://moment.github.io/luxon/docs/manual/parsing.html#table-of-tokens + * @param {string} text - the string to parse + * @param {string} fmt - the format the string is expected to be in (see the link below for the formats) + * @param {Object} opts - options to affect the creation + * @param {string|Zone} [opts.zone='local'] - use this zone if no offset is specified in the input string itself. Will also convert the DateTime to this zone + * @param {boolean} [opts.setZone=false] - override the zone with a zone specified in the string itself, if it specifies one + * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale + * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system + * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @return {DateTime} + */ + ; + + DateTime.fromFormat = function fromFormat(text, fmt, opts) { + if (opts === void 0) { + opts = {}; + } + + if (isUndefined(text) || isUndefined(fmt)) { + throw new InvalidArgumentError("fromFormat requires an input string and a format"); + } + + var _opts = opts, + _opts$locale = _opts.locale, + locale = _opts$locale === void 0 ? null : _opts$locale, + _opts$numberingSystem = _opts.numberingSystem, + numberingSystem = _opts$numberingSystem === void 0 ? null : _opts$numberingSystem, + localeToUse = Locale.fromOpts({ + locale: locale, + numberingSystem: numberingSystem, + defaultToEN: true + }), + _parseFromTokens = parseFromTokens(localeToUse, text, fmt), + vals = _parseFromTokens[0], + parsedZone = _parseFromTokens[1], + invalid = _parseFromTokens[2]; + + if (invalid) { + return DateTime.invalid(invalid); + } else { + return parseDataToDateTime(vals, parsedZone, opts, "format " + fmt, text); + } + } + /** + * @deprecated use fromFormat instead + */ + ; + + DateTime.fromString = function fromString(text, fmt, opts) { + if (opts === void 0) { + opts = {}; + } + + return DateTime.fromFormat(text, fmt, opts); + } + /** + * Create a DateTime from a SQL date, time, or datetime + * Defaults to en-US if no locale has been specified, regardless of the system's locale + * @param {string} text - the string to parse + * @param {Object} opts - options to affect the creation + * @param {string|Zone} [opts.zone='local'] - use this zone if no offset is specified in the input string itself. Will also convert the DateTime to this zone + * @param {boolean} [opts.setZone=false] - override the zone with a zone specified in the string itself, if it specifies one + * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale + * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system + * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @example DateTime.fromSQL('2017-05-15') + * @example DateTime.fromSQL('2017-05-15 09:12:34') + * @example DateTime.fromSQL('2017-05-15 09:12:34.342') + * @example DateTime.fromSQL('2017-05-15 09:12:34.342+06:00') + * @example DateTime.fromSQL('2017-05-15 09:12:34.342 America/Los_Angeles') + * @example DateTime.fromSQL('2017-05-15 09:12:34.342 America/Los_Angeles', { setZone: true }) + * @example DateTime.fromSQL('2017-05-15 09:12:34.342', { zone: 'America/Los_Angeles' }) + * @example DateTime.fromSQL('09:12:34.342') + * @return {DateTime} + */ + ; + + DateTime.fromSQL = function fromSQL(text, opts) { + if (opts === void 0) { + opts = {}; + } + + var _parseSQL = parseSQL(text), + vals = _parseSQL[0], + parsedZone = _parseSQL[1]; + + return parseDataToDateTime(vals, parsedZone, opts, "SQL", text); + } + /** + * Create an invalid DateTime. + * @param {string} reason - simple string of why this DateTime is invalid. Should not contain parameters or anything else data-dependent + * @param {string} [explanation=null] - longer explanation, may include parameters and other useful debugging information + * @return {DateTime} + */ + ; + + DateTime.invalid = function invalid(reason, explanation) { + if (explanation === void 0) { + explanation = null; + } + + if (!reason) { + throw new InvalidArgumentError("need to specify a reason the DateTime is invalid"); + } + + var invalid = reason instanceof Invalid ? reason : new Invalid(reason, explanation); + + if (Settings.throwOnInvalid) { + throw new InvalidDateTimeError(invalid); + } else { + return new DateTime({ + invalid: invalid + }); + } + } + /** + * Check if an object is a DateTime. Works across context boundaries + * @param {object} o + * @return {boolean} + */ + ; + + DateTime.isDateTime = function isDateTime(o) { + return o && o.isLuxonDateTime || false; + } // INFO + + /** + * Get the value of unit. + * @param {string} unit - a unit such as 'minute' or 'day' + * @example DateTime.local(2017, 7, 4).get('month'); //=> 7 + * @example DateTime.local(2017, 7, 4).get('day'); //=> 4 + * @return {number} + */ + ; + + var _proto = DateTime.prototype; + + _proto.get = function get(unit) { + return this[unit]; + } + /** + * Returns whether the DateTime is valid. Invalid DateTimes occur when: + * * The DateTime was created from invalid calendar information, such as the 13th month or February 30 + * * The DateTime was created by an operation on another invalid date + * @type {boolean} + */ + ; + + /** + * Returns the resolved Intl options for this DateTime. + * This is useful in understanding the behavior of formatting methods + * @param {Object} opts - the same options as toLocaleString + * @return {Object} + */ + _proto.resolvedLocaleOpts = function resolvedLocaleOpts(opts) { + if (opts === void 0) { + opts = {}; + } + + var _Formatter$create$res = Formatter.create(this.loc.clone(opts), opts).resolvedOptions(this), + locale = _Formatter$create$res.locale, + numberingSystem = _Formatter$create$res.numberingSystem, + calendar = _Formatter$create$res.calendar; + + return { + locale: locale, + numberingSystem: numberingSystem, + outputCalendar: calendar + }; + } // TRANSFORM + + /** + * "Set" the DateTime's zone to UTC. Returns a newly-constructed DateTime. + * + * Equivalent to {@link setZone}('utc') + * @param {number} [offset=0] - optionally, an offset from UTC in minutes + * @param {Object} [opts={}] - options to pass to `setZone()` + * @return {DateTime} + */ + ; + + _proto.toUTC = function toUTC(offset, opts) { + if (offset === void 0) { + offset = 0; + } + + if (opts === void 0) { + opts = {}; + } + + return this.setZone(FixedOffsetZone.instance(offset), opts); + } + /** + * "Set" the DateTime's zone to the host's local zone. Returns a newly-constructed DateTime. + * + * Equivalent to `setZone('local')` + * @return {DateTime} + */ + ; + + _proto.toLocal = function toLocal() { + return this.setZone(Settings.defaultZone); + } + /** + * "Set" the DateTime's zone to specified zone. Returns a newly-constructed DateTime. + * + * By default, the setter keeps the underlying time the same (as in, the same timestamp), but the new instance will report different local times and consider DSTs when making computations, as with {@link plus}. You may wish to use {@link toLocal} and {@link toUTC} which provide simple convenience wrappers for commonly used zones. + * @param {string|Zone} [zone='local'] - a zone identifier. As a string, that can be any IANA zone supported by the host environment, or a fixed-offset name of the form 'UTC+3', or the strings 'local' or 'utc'. You may also supply an instance of a {@link Zone} class. + * @param {Object} opts - options + * @param {boolean} [opts.keepLocalTime=false] - If true, adjust the underlying time so that the local time stays the same, but in the target zone. You should rarely need this. + * @return {DateTime} + */ + ; + + _proto.setZone = function setZone(zone, _temp) { + var _ref5 = _temp === void 0 ? {} : _temp, + _ref5$keepLocalTime = _ref5.keepLocalTime, + keepLocalTime = _ref5$keepLocalTime === void 0 ? false : _ref5$keepLocalTime, + _ref5$keepCalendarTim = _ref5.keepCalendarTime, + keepCalendarTime = _ref5$keepCalendarTim === void 0 ? false : _ref5$keepCalendarTim; + + zone = normalizeZone(zone, Settings.defaultZone); + + if (zone.equals(this.zone)) { + return this; + } else if (!zone.isValid) { + return DateTime.invalid(unsupportedZone(zone)); + } else { + var newTS = this.ts; + + if (keepLocalTime || keepCalendarTime) { + var offsetGuess = this.o - zone.offset(this.ts); + var asObj = this.toObject(); + + var _objToTS3 = objToTS(asObj, offsetGuess, zone); + + newTS = _objToTS3[0]; + } + + return clone$1(this, { + ts: newTS, + zone: zone + }); + } + } + /** + * "Set" the locale, numberingSystem, or outputCalendar. Returns a newly-constructed DateTime. + * @param {Object} properties - the properties to set + * @example DateTime.local(2017, 5, 25).reconfigure({ locale: 'en-GB' }) + * @return {DateTime} + */ + ; + + _proto.reconfigure = function reconfigure(_temp2) { + var _ref6 = _temp2 === void 0 ? {} : _temp2, + locale = _ref6.locale, + numberingSystem = _ref6.numberingSystem, + outputCalendar = _ref6.outputCalendar; + + var loc = this.loc.clone({ + locale: locale, + numberingSystem: numberingSystem, + outputCalendar: outputCalendar + }); + return clone$1(this, { + loc: loc + }); + } + /** + * "Set" the locale. Returns a newly-constructed DateTime. + * Just a convenient alias for reconfigure({ locale }) + * @example DateTime.local(2017, 5, 25).setLocale('en-GB') + * @return {DateTime} + */ + ; + + _proto.setLocale = function setLocale(locale) { + return this.reconfigure({ + locale: locale + }); + } + /** + * "Set" the values of specified units. Returns a newly-constructed DateTime. + * You can only set units with this method; for "setting" metadata, see {@link reconfigure} and {@link setZone}. + * @param {Object} values - a mapping of units to numbers + * @example dt.set({ year: 2017 }) + * @example dt.set({ hour: 8, minute: 30 }) + * @example dt.set({ weekday: 5 }) + * @example dt.set({ year: 2005, ordinal: 234 }) + * @return {DateTime} + */ + ; + + _proto.set = function set(values) { + if (!this.isValid) return this; + var normalized = normalizeObject(values, normalizeUnit, []), + settingWeekStuff = !isUndefined(normalized.weekYear) || !isUndefined(normalized.weekNumber) || !isUndefined(normalized.weekday); + var mixed; + + if (settingWeekStuff) { + mixed = weekToGregorian(Object.assign(gregorianToWeek(this.c), normalized)); + } else if (!isUndefined(normalized.ordinal)) { + mixed = ordinalToGregorian(Object.assign(gregorianToOrdinal(this.c), normalized)); + } else { + mixed = Object.assign(this.toObject(), normalized); // if we didn't set the day but we ended up on an overflow date, + // use the last day of the right month + + if (isUndefined(normalized.day)) { + mixed.day = Math.min(daysInMonth(mixed.year, mixed.month), mixed.day); + } + } + + var _objToTS4 = objToTS(mixed, this.o, this.zone), + ts = _objToTS4[0], + o = _objToTS4[1]; + + return clone$1(this, { + ts: ts, + o: o + }); + } + /** + * Add a period of time to this DateTime and return the resulting DateTime + * + * Adding hours, minutes, seconds, or milliseconds increases the timestamp by the right number of milliseconds. Adding days, months, or years shifts the calendar, accounting for DSTs and leap years along the way. Thus, `dt.plus({ hours: 24 })` may result in a different time than `dt.plus({ days: 1 })` if there's a DST shift in between. + * @param {Duration|Object|number} duration - The amount to add. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject() + * @example DateTime.local().plus(123) //~> in 123 milliseconds + * @example DateTime.local().plus({ minutes: 15 }) //~> in 15 minutes + * @example DateTime.local().plus({ days: 1 }) //~> this time tomorrow + * @example DateTime.local().plus({ days: -1 }) //~> this time yesterday + * @example DateTime.local().plus({ hours: 3, minutes: 13 }) //~> in 3 hr, 13 min + * @example DateTime.local().plus(Duration.fromObject({ hours: 3, minutes: 13 })) //~> in 3 hr, 13 min + * @return {DateTime} + */ + ; + + _proto.plus = function plus(duration) { + if (!this.isValid) return this; + var dur = friendlyDuration(duration); + return clone$1(this, adjustTime(this, dur)); + } + /** + * Subtract a period of time to this DateTime and return the resulting DateTime + * See {@link plus} + * @param {Duration|Object|number} duration - The amount to subtract. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject() + @return {DateTime} + */ + ; + + _proto.minus = function minus(duration) { + if (!this.isValid) return this; + var dur = friendlyDuration(duration).negate(); + return clone$1(this, adjustTime(this, dur)); + } + /** + * "Set" this DateTime to the beginning of a unit of time. + * @param {string} unit - The unit to go to the beginning of. Can be 'year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', or 'millisecond'. + * @example DateTime.local(2014, 3, 3).startOf('month').toISODate(); //=> '2014-03-01' + * @example DateTime.local(2014, 3, 3).startOf('year').toISODate(); //=> '2014-01-01' + * @example DateTime.local(2014, 3, 3, 5, 30).startOf('day').toISOTime(); //=> '00:00.000-05:00' + * @example DateTime.local(2014, 3, 3, 5, 30).startOf('hour').toISOTime(); //=> '05:00:00.000-05:00' + * @return {DateTime} + */ + ; + + _proto.startOf = function startOf(unit) { + if (!this.isValid) return this; + var o = {}, + normalizedUnit = Duration.normalizeUnit(unit); + + switch (normalizedUnit) { + case "years": + o.month = 1; + // falls through + + case "quarters": + case "months": + o.day = 1; + // falls through + + case "weeks": + case "days": + o.hour = 0; + // falls through + + case "hours": + o.minute = 0; + // falls through + + case "minutes": + o.second = 0; + // falls through + + case "seconds": + o.millisecond = 0; + break; + + case "milliseconds": + break; + // no default, invalid units throw in normalizeUnit() + } + + if (normalizedUnit === "weeks") { + o.weekday = 1; + } + + if (normalizedUnit === "quarters") { + var q = Math.ceil(this.month / 3); + o.month = (q - 1) * 3 + 1; + } + + return this.set(o); + } + /** + * "Set" this DateTime to the end (i.e. the last millisecond) of a unit of time + * @param {string} unit - The unit to go to the end of. Can be 'year', 'month', 'day', 'hour', 'minute', 'second', or 'millisecond'. + * @example DateTime.local(2014, 3, 3).endOf('month').toISO(); //=> '2014-03-31T23:59:59.999-05:00' + * @example DateTime.local(2014, 3, 3).endOf('year').toISO(); //=> '2014-12-31T23:59:59.999-05:00' + * @example DateTime.local(2014, 3, 3, 5, 30).endOf('day').toISO(); //=> '2014-03-03T23:59:59.999-05:00' + * @example DateTime.local(2014, 3, 3, 5, 30).endOf('hour').toISO(); //=> '2014-03-03T05:59:59.999-05:00' + * @return {DateTime} + */ + ; + + _proto.endOf = function endOf(unit) { + var _this$plus; + + return this.isValid ? this.plus((_this$plus = {}, _this$plus[unit] = 1, _this$plus)).startOf(unit).minus(1) : this; + } // OUTPUT + + /** + * Returns a string representation of this DateTime formatted according to the specified format string. + * **You may not want this.** See {@link toLocaleString} for a more flexible formatting tool. For a table of tokens and their interpretations, see [here](https://moment.github.io/luxon/docs/manual/formatting.html#table-of-tokens). + * Defaults to en-US if no locale has been specified, regardless of the system's locale. + * @see https://moment.github.io/luxon/docs/manual/formatting.html#table-of-tokens + * @param {string} fmt - the format string + * @param {Object} opts - opts to override the configuration options + * @example DateTime.local().toFormat('yyyy LLL dd') //=> '2017 Apr 22' + * @example DateTime.local().setLocale('fr').toFormat('yyyy LLL dd') //=> '2017 avr. 22' + * @example DateTime.local().toFormat('yyyy LLL dd', { locale: "fr" }) //=> '2017 avr. 22' + * @example DateTime.local().toFormat("HH 'hours and' mm 'minutes'") //=> '20 hours and 55 minutes' + * @return {string} + */ + ; + + _proto.toFormat = function toFormat(fmt, opts) { + if (opts === void 0) { + opts = {}; + } + + return this.isValid ? Formatter.create(this.loc.redefaultToEN(opts)).formatDateTimeFromString(this, fmt) : INVALID$2; + } + /** + * Returns a localized string representing this date. Accepts the same options as the Intl.DateTimeFormat constructor and any presets defined by Luxon, such as `DateTime.DATE_FULL` or `DateTime.TIME_SIMPLE`. + * The exact behavior of this method is browser-specific, but in general it will return an appropriate representation + * of the DateTime in the assigned locale. + * Defaults to the system's locale if no locale has been specified + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat + * @param opts {Object} - Intl.DateTimeFormat constructor options and configuration options + * @example DateTime.local().toLocaleString(); //=> 4/20/2017 + * @example DateTime.local().setLocale('en-gb').toLocaleString(); //=> '20/04/2017' + * @example DateTime.local().toLocaleString({ locale: 'en-gb' }); //=> '20/04/2017' + * @example DateTime.local().toLocaleString(DateTime.DATE_FULL); //=> 'April 20, 2017' + * @example DateTime.local().toLocaleString(DateTime.TIME_SIMPLE); //=> '11:32 AM' + * @example DateTime.local().toLocaleString(DateTime.DATETIME_SHORT); //=> '4/20/2017, 11:32 AM' + * @example DateTime.local().toLocaleString({ weekday: 'long', month: 'long', day: '2-digit' }); //=> 'Thursday, April 20' + * @example DateTime.local().toLocaleString({ weekday: 'short', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }); //=> 'Thu, Apr 20, 11:27 AM' + * @example DateTime.local().toLocaleString({ hour: '2-digit', minute: '2-digit', hour12: false }); //=> '11:32' + * @return {string} + */ + ; + + _proto.toLocaleString = function toLocaleString(opts) { + if (opts === void 0) { + opts = DATE_SHORT; + } + + return this.isValid ? Formatter.create(this.loc.clone(opts), opts).formatDateTime(this) : INVALID$2; + } + /** + * Returns an array of format "parts", i.e. individual tokens along with metadata. This is allows callers to post-process individual sections of the formatted output. + * Defaults to the system's locale if no locale has been specified + * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat/formatToParts + * @param opts {Object} - Intl.DateTimeFormat constructor options, same as `toLocaleString`. + * @example DateTime.local().toLocaleString(); //=> [ + * //=> { type: 'day', value: '25' }, + * //=> { type: 'literal', value: '/' }, + * //=> { type: 'month', value: '05' }, + * //=> { type: 'literal', value: '/' }, + * //=> { type: 'year', value: '1982' } + * //=> ] + */ + ; + + _proto.toLocaleParts = function toLocaleParts(opts) { + if (opts === void 0) { + opts = {}; + } + + return this.isValid ? Formatter.create(this.loc.clone(opts), opts).formatDateTimeParts(this) : []; + } + /** + * Returns an ISO 8601-compliant string representation of this DateTime + * @param {Object} opts - options + * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0 + * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0 + * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00' + * @example DateTime.utc(1982, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z' + * @example DateTime.local().toISO() //=> '2017-04-22T20:47:05.335-04:00' + * @example DateTime.local().toISO({ includeOffset: false }) //=> '2017-04-22T20:47:05.335' + * @return {string} + */ + ; + + _proto.toISO = function toISO(opts) { + if (opts === void 0) { + opts = {}; + } + + if (!this.isValid) { + return null; + } + + return this.toISODate() + "T" + this.toISOTime(opts); + } + /** + * Returns an ISO 8601-compliant string representation of this DateTime's date component + * @example DateTime.utc(1982, 5, 25).toISODate() //=> '1982-05-25' + * @return {string} + */ + ; + + _proto.toISODate = function toISODate() { + var format = "yyyy-MM-dd"; + + if (this.year > 9999) { + format = "+" + format; + } + + return toTechFormat(this, format); + } + /** + * Returns an ISO 8601-compliant string representation of this DateTime's week date + * @example DateTime.utc(1982, 5, 25).toISOWeekDate() //=> '1982-W21-2' + * @return {string} + */ + ; + + _proto.toISOWeekDate = function toISOWeekDate() { + return toTechFormat(this, "kkkk-'W'WW-c"); + } + /** + * Returns an ISO 8601-compliant string representation of this DateTime's time component + * @param {Object} opts - options + * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0 + * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0 + * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00' + * @example DateTime.utc().hour(7).minute(34).toISOTime() //=> '07:34:19.361Z' + * @example DateTime.utc().hour(7).minute(34).toISOTime({ suppressSeconds: true }) //=> '07:34Z' + * @return {string} + */ + ; + + _proto.toISOTime = function toISOTime(_temp3) { + var _ref7 = _temp3 === void 0 ? {} : _temp3, + _ref7$suppressMillise = _ref7.suppressMilliseconds, + suppressMilliseconds = _ref7$suppressMillise === void 0 ? false : _ref7$suppressMillise, + _ref7$suppressSeconds = _ref7.suppressSeconds, + suppressSeconds = _ref7$suppressSeconds === void 0 ? false : _ref7$suppressSeconds, + _ref7$includeOffset = _ref7.includeOffset, + includeOffset = _ref7$includeOffset === void 0 ? true : _ref7$includeOffset; + + return toTechTimeFormat(this, { + suppressSeconds: suppressSeconds, + suppressMilliseconds: suppressMilliseconds, + includeOffset: includeOffset + }); + } + /** + * Returns an RFC 2822-compatible string representation of this DateTime, always in UTC + * @example DateTime.utc(2014, 7, 13).toRFC2822() //=> 'Sun, 13 Jul 2014 00:00:00 +0000' + * @example DateTime.local(2014, 7, 13).toRFC2822() //=> 'Sun, 13 Jul 2014 00:00:00 -0400' + * @return {string} + */ + ; + + _proto.toRFC2822 = function toRFC2822() { + return toTechFormat(this, "EEE, dd LLL yyyy HH:mm:ss ZZZ"); + } + /** + * Returns a string representation of this DateTime appropriate for use in HTTP headers. + * Specifically, the string conforms to RFC 1123. + * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3.1 + * @example DateTime.utc(2014, 7, 13).toHTTP() //=> 'Sun, 13 Jul 2014 00:00:00 GMT' + * @example DateTime.utc(2014, 7, 13, 19).toHTTP() //=> 'Sun, 13 Jul 2014 19:00:00 GMT' + * @return {string} + */ + ; + + _proto.toHTTP = function toHTTP() { + return toTechFormat(this.toUTC(), "EEE, dd LLL yyyy HH:mm:ss 'GMT'"); + } + /** + * Returns a string representation of this DateTime appropriate for use in SQL Date + * @example DateTime.utc(2014, 7, 13).toSQLDate() //=> '2014-07-13' + * @return {string} + */ + ; + + _proto.toSQLDate = function toSQLDate() { + return toTechFormat(this, "yyyy-MM-dd"); + } + /** + * Returns a string representation of this DateTime appropriate for use in SQL Time + * @param {Object} opts - options + * @param {boolean} [opts.includeZone=false] - include the zone, such as 'America/New_York'. Overrides includeOffset. + * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00' + * @example DateTime.utc().toSQL() //=> '05:15:16.345' + * @example DateTime.local().toSQL() //=> '05:15:16.345 -04:00' + * @example DateTime.local().toSQL({ includeOffset: false }) //=> '05:15:16.345' + * @example DateTime.local().toSQL({ includeZone: false }) //=> '05:15:16.345 America/New_York' + * @return {string} + */ + ; + + _proto.toSQLTime = function toSQLTime(_temp4) { + var _ref8 = _temp4 === void 0 ? {} : _temp4, + _ref8$includeOffset = _ref8.includeOffset, + includeOffset = _ref8$includeOffset === void 0 ? true : _ref8$includeOffset, + _ref8$includeZone = _ref8.includeZone, + includeZone = _ref8$includeZone === void 0 ? false : _ref8$includeZone; + + return toTechTimeFormat(this, { + includeOffset: includeOffset, + includeZone: includeZone, + spaceZone: true + }); + } + /** + * Returns a string representation of this DateTime appropriate for use in SQL DateTime + * @param {Object} opts - options + * @param {boolean} [opts.includeZone=false] - include the zone, such as 'America/New_York'. Overrides includeOffset. + * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00' + * @example DateTime.utc(2014, 7, 13).toSQL() //=> '2014-07-13 00:00:00.000 Z' + * @example DateTime.local(2014, 7, 13).toSQL() //=> '2014-07-13 00:00:00.000 -04:00' + * @example DateTime.local(2014, 7, 13).toSQL({ includeOffset: false }) //=> '2014-07-13 00:00:00.000' + * @example DateTime.local(2014, 7, 13).toSQL({ includeZone: true }) //=> '2014-07-13 00:00:00.000 America/New_York' + * @return {string} + */ + ; + + _proto.toSQL = function toSQL(opts) { + if (opts === void 0) { + opts = {}; + } + + if (!this.isValid) { + return null; + } + + return this.toSQLDate() + " " + this.toSQLTime(opts); + } + /** + * Returns a string representation of this DateTime appropriate for debugging + * @return {string} + */ + ; + + _proto.toString = function toString() { + return this.isValid ? this.toISO() : INVALID$2; + } + /** + * Returns the epoch milliseconds of this DateTime. Alias of {@link toMillis} + * @return {number} + */ + ; + + _proto.valueOf = function valueOf() { + return this.toMillis(); + } + /** + * Returns the epoch milliseconds of this DateTime. + * @return {number} + */ + ; + + _proto.toMillis = function toMillis() { + return this.isValid ? this.ts : NaN; + } + /** + * Returns the epoch seconds of this DateTime. + * @return {number} + */ + ; + + _proto.toSeconds = function toSeconds() { + return this.isValid ? this.ts / 1000 : NaN; + } + /** + * Returns an ISO 8601 representation of this DateTime appropriate for use in JSON. + * @return {string} + */ + ; + + _proto.toJSON = function toJSON() { + return this.toISO(); + } + /** + * Returns a BSON serializable equivalent to this DateTime. + * @return {Date} + */ + ; + + _proto.toBSON = function toBSON() { + return this.toJSDate(); + } + /** + * Returns a Javascript object with this DateTime's year, month, day, and so on. + * @param opts - options for generating the object + * @param {boolean} [opts.includeConfig=false] - include configuration attributes in the output + * @example DateTime.local().toObject() //=> { year: 2017, month: 4, day: 22, hour: 20, minute: 49, second: 42, millisecond: 268 } + * @return {Object} + */ + ; + + _proto.toObject = function toObject(opts) { + if (opts === void 0) { + opts = {}; + } + + if (!this.isValid) return {}; + var base = Object.assign({}, this.c); + + if (opts.includeConfig) { + base.outputCalendar = this.outputCalendar; + base.numberingSystem = this.loc.numberingSystem; + base.locale = this.loc.locale; + } + + return base; + } + /** + * Returns a Javascript Date equivalent to this DateTime. + * @return {Date} + */ + ; + + _proto.toJSDate = function toJSDate() { + return new Date(this.isValid ? this.ts : NaN); + } // COMPARE + + /** + * Return the difference between two DateTimes as a Duration. + * @param {DateTime} otherDateTime - the DateTime to compare this one to + * @param {string|string[]} [unit=['milliseconds']] - the unit or array of units (such as 'hours' or 'days') to include in the duration. + * @param {Object} opts - options that affect the creation of the Duration + * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use + * @example + * var i1 = DateTime.fromISO('1982-05-25T09:45'), + * i2 = DateTime.fromISO('1983-10-14T10:30'); + * i2.diff(i1).toObject() //=> { milliseconds: 43807500000 } + * i2.diff(i1, 'hours').toObject() //=> { hours: 12168.75 } + * i2.diff(i1, ['months', 'days']).toObject() //=> { months: 16, days: 19.03125 } + * i2.diff(i1, ['months', 'days', 'hours']).toObject() //=> { months: 16, days: 19, hours: 0.75 } + * @return {Duration} + */ + ; + + _proto.diff = function diff(otherDateTime, unit, opts) { + if (unit === void 0) { + unit = "milliseconds"; + } + + if (opts === void 0) { + opts = {}; + } + + if (!this.isValid || !otherDateTime.isValid) { + return Duration.invalid(this.invalid || otherDateTime.invalid, "created by diffing an invalid DateTime"); + } + + var durOpts = Object.assign({ + locale: this.locale, + numberingSystem: this.numberingSystem + }, opts); + + var units = maybeArray(unit).map(Duration.normalizeUnit), + otherIsLater = otherDateTime.valueOf() > this.valueOf(), + earlier = otherIsLater ? this : otherDateTime, + later = otherIsLater ? otherDateTime : this, + diffed = _diff(earlier, later, units, durOpts); + + return otherIsLater ? diffed.negate() : diffed; + } + /** + * Return the difference between this DateTime and right now. + * See {@link diff} + * @param {string|string[]} [unit=['milliseconds']] - the unit or units units (such as 'hours' or 'days') to include in the duration + * @param {Object} opts - options that affect the creation of the Duration + * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use + * @return {Duration} + */ + ; + + _proto.diffNow = function diffNow(unit, opts) { + if (unit === void 0) { + unit = "milliseconds"; + } + + if (opts === void 0) { + opts = {}; + } + + return this.diff(DateTime.local(), unit, opts); + } + /** + * Return an Interval spanning between this DateTime and another DateTime + * @param {DateTime} otherDateTime - the other end point of the Interval + * @return {Interval} + */ + ; + + _proto.until = function until(otherDateTime) { + return this.isValid ? Interval.fromDateTimes(this, otherDateTime) : this; + } + /** + * Return whether this DateTime is in the same unit of time as another DateTime + * @param {DateTime} otherDateTime - the other DateTime + * @param {string} unit - the unit of time to check sameness on + * @example DateTime.local().hasSame(otherDT, 'day'); //~> true if both the same calendar day + * @return {boolean} + */ + ; + + _proto.hasSame = function hasSame(otherDateTime, unit) { + if (!this.isValid) return false; + + if (unit === "millisecond") { + return this.valueOf() === otherDateTime.valueOf(); + } else { + var inputMs = otherDateTime.valueOf(); + return this.startOf(unit) <= inputMs && inputMs <= this.endOf(unit); + } + } + /** + * Equality check + * Two DateTimes are equal iff they represent the same millisecond, have the same zone and location, and are both valid. + * To compare just the millisecond values, use `+dt1 === +dt2`. + * @param {DateTime} other - the other DateTime + * @return {boolean} + */ + ; + + _proto.equals = function equals(other) { + return this.isValid && other.isValid && this.valueOf() === other.valueOf() && this.zone.equals(other.zone) && this.loc.equals(other.loc); + } + /** + * Returns a string representation of a this time relative to now, such as "in two days". Can only internationalize if your + * platform supports Intl.RelativeTimeFormat. Rounds down by default. + * @param {Object} options - options that affect the output + * @param {DateTime} [options.base=DateTime.local()] - the DateTime to use as the basis to which this time is compared. Defaults to now. + * @param {string} [options.style="long"] - the style of units, must be "long", "short", or "narrow" + * @param {string} options.unit - use a specific unit; if omitted, the method will pick the unit. Use one of "years", "quarters", "months", "weeks", "days", "hours", "minutes", or "seconds" + * @param {boolean} [options.round=true] - whether to round the numbers in the output. + * @param {boolean} [options.padding=0] - padding in milliseconds. This allows you to round up the result if it fits inside the threshold. Don't use in combination with {round: false} because the decimal output will include the padding. + * @param {string} options.locale - override the locale of this DateTime + * @param {string} options.numberingSystem - override the numberingSystem of this DateTime. The Intl system may choose not to honor this + * @example DateTime.local().plus({ days: 1 }).toRelative() //=> "in 1 day" + * @example DateTime.local().setLocale("es").toRelative({ days: 1 }) //=> "dentro de 1 día" + * @example DateTime.local().plus({ days: 1 }).toRelative({ locale: "fr" }) //=> "dans 23 heures" + * @example DateTime.local().minus({ days: 2 }).toRelative() //=> "2 days ago" + * @example DateTime.local().minus({ days: 2 }).toRelative({ unit: "hours" }) //=> "48 hours ago" + * @example DateTime.local().minus({ hours: 36 }).toRelative({ round: false }) //=> "1.5 days ago" + */ + ; + + _proto.toRelative = function toRelative(options) { + if (options === void 0) { + options = {}; + } + + if (!this.isValid) return null; + var base = options.base || DateTime.fromObject({ + zone: this.zone + }), + padding = options.padding ? this < base ? -options.padding : options.padding : 0; + return diffRelative(base, this.plus(padding), Object.assign(options, { + numeric: "always", + units: ["years", "months", "days", "hours", "minutes", "seconds"] + })); + } + /** + * Returns a string representation of this date relative to today, such as "yesterday" or "next month". + * Only internationalizes on platforms that supports Intl.RelativeTimeFormat. + * @param {Object} options - options that affect the output + * @param {DateTime} [options.base=DateTime.local()] - the DateTime to use as the basis to which this time is compared. Defaults to now. + * @param {string} options.locale - override the locale of this DateTime + * @param {string} options.unit - use a specific unit; if omitted, the method will pick the unit. Use one of "years", "quarters", "months", "weeks", or "days" + * @param {string} options.numberingSystem - override the numberingSystem of this DateTime. The Intl system may choose not to honor this + * @example DateTime.local().plus({ days: 1 }).toRelativeCalendar() //=> "tomorrow" + * @example DateTime.local().setLocale("es").plus({ days: 1 }).toRelative() //=> ""mañana" + * @example DateTime.local().plus({ days: 1 }).toRelativeCalendar({ locale: "fr" }) //=> "demain" + * @example DateTime.local().minus({ days: 2 }).toRelativeCalendar() //=> "2 days ago" + */ + ; + + _proto.toRelativeCalendar = function toRelativeCalendar(options) { + if (options === void 0) { + options = {}; + } + + if (!this.isValid) return null; + return diffRelative(options.base || DateTime.fromObject({ + zone: this.zone + }), this, Object.assign(options, { + numeric: "auto", + units: ["years", "months", "days"], + calendary: true + })); + } + /** + * Return the min of several date times + * @param {...DateTime} dateTimes - the DateTimes from which to choose the minimum + * @return {DateTime} the min DateTime, or undefined if called with no argument + */ + ; + + DateTime.min = function min() { + for (var _len = arguments.length, dateTimes = new Array(_len), _key = 0; _key < _len; _key++) { + dateTimes[_key] = arguments[_key]; + } + + if (!dateTimes.every(DateTime.isDateTime)) { + throw new InvalidArgumentError("min requires all arguments be DateTimes"); + } + + return bestBy(dateTimes, function (i) { + return i.valueOf(); + }, Math.min); + } + /** + * Return the max of several date times + * @param {...DateTime} dateTimes - the DateTimes from which to choose the maximum + * @return {DateTime} the max DateTime, or undefined if called with no argument + */ + ; + + DateTime.max = function max() { + for (var _len2 = arguments.length, dateTimes = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + dateTimes[_key2] = arguments[_key2]; + } + + if (!dateTimes.every(DateTime.isDateTime)) { + throw new InvalidArgumentError("max requires all arguments be DateTimes"); + } + + return bestBy(dateTimes, function (i) { + return i.valueOf(); + }, Math.max); + } // MISC + + /** + * Explain how a string would be parsed by fromFormat() + * @param {string} text - the string to parse + * @param {string} fmt - the format the string is expected to be in (see description) + * @param {Object} options - options taken by fromFormat() + * @return {Object} + */ + ; + + DateTime.fromFormatExplain = function fromFormatExplain(text, fmt, options) { + if (options === void 0) { + options = {}; + } + + var _options = options, + _options$locale = _options.locale, + locale = _options$locale === void 0 ? null : _options$locale, + _options$numberingSys = _options.numberingSystem, + numberingSystem = _options$numberingSys === void 0 ? null : _options$numberingSys, + localeToUse = Locale.fromOpts({ + locale: locale, + numberingSystem: numberingSystem, + defaultToEN: true + }); + return explainFromTokens(localeToUse, text, fmt); + } + /** + * @deprecated use fromFormatExplain instead + */ + ; + + DateTime.fromStringExplain = function fromStringExplain(text, fmt, options) { + if (options === void 0) { + options = {}; + } + + return DateTime.fromFormatExplain(text, fmt, options); + } // FORMAT PRESETS + + /** + * {@link toLocaleString} format like 10/14/1983 + * @type {Object} + */ + ; + + _createClass(DateTime, [{ + key: "isValid", + get: function get() { + return this.invalid === null; + } + /** + * Returns an error code if this DateTime is invalid, or null if the DateTime is valid + * @type {string} + */ + + }, { + key: "invalidReason", + get: function get() { + return this.invalid ? this.invalid.reason : null; + } + /** + * Returns an explanation of why this DateTime became invalid, or null if the DateTime is valid + * @type {string} + */ + + }, { + key: "invalidExplanation", + get: function get() { + return this.invalid ? this.invalid.explanation : null; + } + /** + * Get the locale of a DateTime, such 'en-GB'. The locale is used when formatting the DateTime + * + * @type {string} + */ + + }, { + key: "locale", + get: function get() { + return this.isValid ? this.loc.locale : null; + } + /** + * Get the numbering system of a DateTime, such 'beng'. The numbering system is used when formatting the DateTime + * + * @type {string} + */ + + }, { + key: "numberingSystem", + get: function get() { + return this.isValid ? this.loc.numberingSystem : null; + } + /** + * Get the output calendar of a DateTime, such 'islamic'. The output calendar is used when formatting the DateTime + * + * @type {string} + */ + + }, { + key: "outputCalendar", + get: function get() { + return this.isValid ? this.loc.outputCalendar : null; + } + /** + * Get the time zone associated with this DateTime. + * @type {Zone} + */ + + }, { + key: "zone", + get: function get() { + return this._zone; + } + /** + * Get the name of the time zone. + * @type {string} + */ + + }, { + key: "zoneName", + get: function get() { + return this.isValid ? this.zone.name : null; + } + /** + * Get the year + * @example DateTime.local(2017, 5, 25).year //=> 2017 + * @type {number} + */ + + }, { + key: "year", + get: function get() { + return this.isValid ? this.c.year : NaN; + } + /** + * Get the quarter + * @example DateTime.local(2017, 5, 25).quarter //=> 2 + * @type {number} + */ + + }, { + key: "quarter", + get: function get() { + return this.isValid ? Math.ceil(this.c.month / 3) : NaN; + } + /** + * Get the month (1-12). + * @example DateTime.local(2017, 5, 25).month //=> 5 + * @type {number} + */ + + }, { + key: "month", + get: function get() { + return this.isValid ? this.c.month : NaN; + } + /** + * Get the day of the month (1-30ish). + * @example DateTime.local(2017, 5, 25).day //=> 25 + * @type {number} + */ + + }, { + key: "day", + get: function get() { + return this.isValid ? this.c.day : NaN; + } + /** + * Get the hour of the day (0-23). + * @example DateTime.local(2017, 5, 25, 9).hour //=> 9 + * @type {number} + */ + + }, { + key: "hour", + get: function get() { + return this.isValid ? this.c.hour : NaN; + } + /** + * Get the minute of the hour (0-59). + * @example DateTime.local(2017, 5, 25, 9, 30).minute //=> 30 + * @type {number} + */ + + }, { + key: "minute", + get: function get() { + return this.isValid ? this.c.minute : NaN; + } + /** + * Get the second of the minute (0-59). + * @example DateTime.local(2017, 5, 25, 9, 30, 52).second //=> 52 + * @type {number} + */ + + }, { + key: "second", + get: function get() { + return this.isValid ? this.c.second : NaN; + } + /** + * Get the millisecond of the second (0-999). + * @example DateTime.local(2017, 5, 25, 9, 30, 52, 654).millisecond //=> 654 + * @type {number} + */ + + }, { + key: "millisecond", + get: function get() { + return this.isValid ? this.c.millisecond : NaN; + } + /** + * Get the week year + * @see https://en.wikipedia.org/wiki/ISO_week_date + * @example DateTime.local(2014, 11, 31).weekYear //=> 2015 + * @type {number} + */ + + }, { + key: "weekYear", + get: function get() { + return this.isValid ? possiblyCachedWeekData(this).weekYear : NaN; + } + /** + * Get the week number of the week year (1-52ish). + * @see https://en.wikipedia.org/wiki/ISO_week_date + * @example DateTime.local(2017, 5, 25).weekNumber //=> 21 + * @type {number} + */ + + }, { + key: "weekNumber", + get: function get() { + return this.isValid ? possiblyCachedWeekData(this).weekNumber : NaN; + } + /** + * Get the day of the week. + * 1 is Monday and 7 is Sunday + * @see https://en.wikipedia.org/wiki/ISO_week_date + * @example DateTime.local(2014, 11, 31).weekday //=> 4 + * @type {number} + */ + + }, { + key: "weekday", + get: function get() { + return this.isValid ? possiblyCachedWeekData(this).weekday : NaN; + } + /** + * Get the ordinal (i.e. the day of the year) + * @example DateTime.local(2017, 5, 25).ordinal //=> 145 + * @type {number|DateTime} + */ + + }, { + key: "ordinal", + get: function get() { + return this.isValid ? gregorianToOrdinal(this.c).ordinal : NaN; + } + /** + * Get the human readable short month name, such as 'Oct'. + * Defaults to the system's locale if no locale has been specified + * @example DateTime.local(2017, 10, 30).monthShort //=> Oct + * @type {string} + */ + + }, { + key: "monthShort", + get: function get() { + return this.isValid ? Info.months("short", { + locale: this.locale + })[this.month - 1] : null; + } + /** + * Get the human readable long month name, such as 'October'. + * Defaults to the system's locale if no locale has been specified + * @example DateTime.local(2017, 10, 30).monthLong //=> October + * @type {string} + */ + + }, { + key: "monthLong", + get: function get() { + return this.isValid ? Info.months("long", { + locale: this.locale + })[this.month - 1] : null; + } + /** + * Get the human readable short weekday, such as 'Mon'. + * Defaults to the system's locale if no locale has been specified + * @example DateTime.local(2017, 10, 30).weekdayShort //=> Mon + * @type {string} + */ + + }, { + key: "weekdayShort", + get: function get() { + return this.isValid ? Info.weekdays("short", { + locale: this.locale + })[this.weekday - 1] : null; + } + /** + * Get the human readable long weekday, such as 'Monday'. + * Defaults to the system's locale if no locale has been specified + * @example DateTime.local(2017, 10, 30).weekdayLong //=> Monday + * @type {string} + */ + + }, { + key: "weekdayLong", + get: function get() { + return this.isValid ? Info.weekdays("long", { + locale: this.locale + })[this.weekday - 1] : null; + } + /** + * Get the UTC offset of this DateTime in minutes + * @example DateTime.local().offset //=> -240 + * @example DateTime.utc().offset //=> 0 + * @type {number} + */ + + }, { + key: "offset", + get: function get() { + return this.isValid ? this.zone.offset(this.ts) : NaN; + } + /** + * Get the short human name for the zone's current offset, for example "EST" or "EDT". + * Defaults to the system's locale if no locale has been specified + * @type {string} + */ + + }, { + key: "offsetNameShort", + get: function get() { + if (this.isValid) { + return this.zone.offsetName(this.ts, { + format: "short", + locale: this.locale + }); + } else { + return null; + } + } + /** + * Get the long human name for the zone's current offset, for example "Eastern Standard Time" or "Eastern Daylight Time". + * Defaults to the system's locale if no locale has been specified + * @type {string} + */ + + }, { + key: "offsetNameLong", + get: function get() { + if (this.isValid) { + return this.zone.offsetName(this.ts, { + format: "long", + locale: this.locale + }); + } else { + return null; + } + } + /** + * Get whether this zone's offset ever changes, as in a DST. + * @type {boolean} + */ + + }, { + key: "isOffsetFixed", + get: function get() { + return this.isValid ? this.zone.universal : null; + } + /** + * Get whether the DateTime is in a DST. + * @type {boolean} + */ + + }, { + key: "isInDST", + get: function get() { + if (this.isOffsetFixed) { + return false; + } else { + return this.offset > this.set({ + month: 1 + }).offset || this.offset > this.set({ + month: 5 + }).offset; + } + } + /** + * Returns true if this DateTime is in a leap year, false otherwise + * @example DateTime.local(2016).isInLeapYear //=> true + * @example DateTime.local(2013).isInLeapYear //=> false + * @type {boolean} + */ + + }, { + key: "isInLeapYear", + get: function get() { + return isLeapYear(this.year); + } + /** + * Returns the number of days in this DateTime's month + * @example DateTime.local(2016, 2).daysInMonth //=> 29 + * @example DateTime.local(2016, 3).daysInMonth //=> 31 + * @type {number} + */ + + }, { + key: "daysInMonth", + get: function get() { + return daysInMonth(this.year, this.month); + } + /** + * Returns the number of days in this DateTime's year + * @example DateTime.local(2016).daysInYear //=> 366 + * @example DateTime.local(2013).daysInYear //=> 365 + * @type {number} + */ + + }, { + key: "daysInYear", + get: function get() { + return this.isValid ? daysInYear(this.year) : NaN; + } + /** + * Returns the number of weeks in this DateTime's year + * @see https://en.wikipedia.org/wiki/ISO_week_date + * @example DateTime.local(2004).weeksInWeekYear //=> 53 + * @example DateTime.local(2013).weeksInWeekYear //=> 52 + * @type {number} + */ + + }, { + key: "weeksInWeekYear", + get: function get() { + return this.isValid ? weeksInWeekYear(this.weekYear) : NaN; + } + }], [{ + key: "DATE_SHORT", + get: function get() { + return DATE_SHORT; + } + /** + * {@link toLocaleString} format like 'Oct 14, 1983' + * @type {Object} + */ + + }, { + key: "DATE_MED", + get: function get() { + return DATE_MED; + } + /** + * {@link toLocaleString} format like 'October 14, 1983' + * @type {Object} + */ + + }, { + key: "DATE_FULL", + get: function get() { + return DATE_FULL; + } + /** + * {@link toLocaleString} format like 'Tuesday, October 14, 1983' + * @type {Object} + */ + + }, { + key: "DATE_HUGE", + get: function get() { + return DATE_HUGE; + } + /** + * {@link toLocaleString} format like '09:30 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "TIME_SIMPLE", + get: function get() { + return TIME_SIMPLE; + } + /** + * {@link toLocaleString} format like '09:30:23 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "TIME_WITH_SECONDS", + get: function get() { + return TIME_WITH_SECONDS; + } + /** + * {@link toLocaleString} format like '09:30:23 AM EDT'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "TIME_WITH_SHORT_OFFSET", + get: function get() { + return TIME_WITH_SHORT_OFFSET; + } + /** + * {@link toLocaleString} format like '09:30:23 AM Eastern Daylight Time'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "TIME_WITH_LONG_OFFSET", + get: function get() { + return TIME_WITH_LONG_OFFSET; + } + /** + * {@link toLocaleString} format like '09:30', always 24-hour. + * @type {Object} + */ + + }, { + key: "TIME_24_SIMPLE", + get: function get() { + return TIME_24_SIMPLE; + } + /** + * {@link toLocaleString} format like '09:30:23', always 24-hour. + * @type {Object} + */ + + }, { + key: "TIME_24_WITH_SECONDS", + get: function get() { + return TIME_24_WITH_SECONDS; + } + /** + * {@link toLocaleString} format like '09:30:23 EDT', always 24-hour. + * @type {Object} + */ + + }, { + key: "TIME_24_WITH_SHORT_OFFSET", + get: function get() { + return TIME_24_WITH_SHORT_OFFSET; + } + /** + * {@link toLocaleString} format like '09:30:23 Eastern Daylight Time', always 24-hour. + * @type {Object} + */ + + }, { + key: "TIME_24_WITH_LONG_OFFSET", + get: function get() { + return TIME_24_WITH_LONG_OFFSET; + } + /** + * {@link toLocaleString} format like '10/14/1983, 9:30 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_SHORT", + get: function get() { + return DATETIME_SHORT; + } + /** + * {@link toLocaleString} format like '10/14/1983, 9:30:33 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_SHORT_WITH_SECONDS", + get: function get() { + return DATETIME_SHORT_WITH_SECONDS; + } + /** + * {@link toLocaleString} format like 'Oct 14, 1983, 9:30 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_MED", + get: function get() { + return DATETIME_MED; + } + /** + * {@link toLocaleString} format like 'Oct 14, 1983, 9:30:33 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_MED_WITH_SECONDS", + get: function get() { + return DATETIME_MED_WITH_SECONDS; + } + /** + * {@link toLocaleString} format like 'Fri, 14 Oct 1983, 9:30 AM'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_MED_WITH_WEEKDAY", + get: function get() { + return DATETIME_MED_WITH_WEEKDAY; + } + /** + * {@link toLocaleString} format like 'October 14, 1983, 9:30 AM EDT'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_FULL", + get: function get() { + return DATETIME_FULL; + } + /** + * {@link toLocaleString} format like 'October 14, 1983, 9:30:33 AM EDT'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_FULL_WITH_SECONDS", + get: function get() { + return DATETIME_FULL_WITH_SECONDS; + } + /** + * {@link toLocaleString} format like 'Friday, October 14, 1983, 9:30 AM Eastern Daylight Time'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_HUGE", + get: function get() { + return DATETIME_HUGE; + } + /** + * {@link toLocaleString} format like 'Friday, October 14, 1983, 9:30:33 AM Eastern Daylight Time'. Only 12-hour if the locale is. + * @type {Object} + */ + + }, { + key: "DATETIME_HUGE_WITH_SECONDS", + get: function get() { + return DATETIME_HUGE_WITH_SECONDS; + } + }]); + + return DateTime; + }(); + function friendlyDateTime(dateTimeish) { + if (DateTime.isDateTime(dateTimeish)) { + return dateTimeish; + } else if (dateTimeish && dateTimeish.valueOf && isNumber(dateTimeish.valueOf())) { + return DateTime.fromJSDate(dateTimeish); + } else if (dateTimeish && typeof dateTimeish === "object") { + return DateTime.fromObject(dateTimeish); + } else { + throw new InvalidArgumentError("Unknown datetime argument: " + dateTimeish + ", of type " + typeof dateTimeish); + } + } + + exports.DateTime = DateTime; + exports.Duration = Duration; + exports.FixedOffsetZone = FixedOffsetZone; + exports.IANAZone = IANAZone; + exports.Info = Info; + exports.Interval = Interval; + exports.InvalidZone = InvalidZone; + exports.LocalZone = LocalZone; + exports.Settings = Settings; + exports.Zone = Zone; + + return exports; + +}({})); +//# sourceMappingURL=luxon.js.map diff --git a/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js.map b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js.map new file mode 100644 index 0000000000..87a44345a2 --- /dev/null +++ b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.js.map @@ -0,0 +1 @@ +{"version":3,"file":"luxon.js","sources":["../../src/errors.js","../../src/impl/util.js","../../src/impl/formats.js","../../src/impl/english.js","../../src/zone.js","../../src/zones/localZone.js","../../src/zones/IANAZone.js","../../src/zones/fixedOffsetZone.js","../../src/zones/invalidZone.js","../../src/impl/zoneUtil.js","../../src/settings.js","../../src/impl/formatter.js","../../src/impl/locale.js","../../src/impl/regexParser.js","../../src/impl/invalid.js","../../src/duration.js","../../src/interval.js","../../src/info.js","../../src/impl/diff.js","../../src/impl/digits.js","../../src/impl/tokenParser.js","../../src/impl/conversions.js","../../src/datetime.js"],"sourcesContent":["// these aren't really private, but nor are they really useful to document\n\n/**\n * @private\n */\nclass LuxonError extends Error {}\n\n/**\n * @private\n */\nexport class InvalidDateTimeError extends LuxonError {\n constructor(reason) {\n super(`Invalid DateTime: ${reason.toMessage()}`);\n }\n}\n\n/**\n * @private\n */\nexport class InvalidIntervalError extends LuxonError {\n constructor(reason) {\n super(`Invalid Interval: ${reason.toMessage()}`);\n }\n}\n\n/**\n * @private\n */\nexport class InvalidDurationError extends LuxonError {\n constructor(reason) {\n super(`Invalid Duration: ${reason.toMessage()}`);\n }\n}\n\n/**\n * @private\n */\nexport class ConflictingSpecificationError extends LuxonError {}\n\n/**\n * @private\n */\nexport class InvalidUnitError extends LuxonError {\n constructor(unit) {\n super(`Invalid unit ${unit}`);\n }\n}\n\n/**\n * @private\n */\nexport class InvalidArgumentError extends LuxonError {}\n\n/**\n * @private\n */\nexport class ZoneIsAbstractError extends LuxonError {\n constructor() {\n super(\"Zone is an abstract class\");\n }\n}\n","/*\n This is just a junk drawer, containing anything used across multiple classes.\n Because Luxon is small(ish), this should stay small and we won't worry about splitting\n it up into, say, parsingUtil.js and basicUtil.js and so on. But they are divided up by feature area.\n*/\n\nimport { InvalidArgumentError } from \"../errors.js\";\n\n/**\n * @private\n */\n\n// TYPES\n\nexport function isUndefined(o) {\n return typeof o === \"undefined\";\n}\n\nexport function isNumber(o) {\n return typeof o === \"number\";\n}\n\nexport function isInteger(o) {\n return typeof o === \"number\" && o % 1 === 0;\n}\n\nexport function isString(o) {\n return typeof o === \"string\";\n}\n\nexport function isDate(o) {\n return Object.prototype.toString.call(o) === \"[object Date]\";\n}\n\n// CAPABILITIES\n\nexport function hasIntl() {\n try {\n return typeof Intl !== \"undefined\" && Intl.DateTimeFormat;\n } catch (e) {\n return false;\n }\n}\n\nexport function hasFormatToParts() {\n return !isUndefined(Intl.DateTimeFormat.prototype.formatToParts);\n}\n\nexport function hasRelative() {\n try {\n return typeof Intl !== \"undefined\" && !!Intl.RelativeTimeFormat;\n } catch (e) {\n return false;\n }\n}\n\n// OBJECTS AND ARRAYS\n\nexport function maybeArray(thing) {\n return Array.isArray(thing) ? thing : [thing];\n}\n\nexport function bestBy(arr, by, compare) {\n if (arr.length === 0) {\n return undefined;\n }\n return arr.reduce((best, next) => {\n const pair = [by(next), next];\n if (!best) {\n return pair;\n } else if (compare(best[0], pair[0]) === best[0]) {\n return best;\n } else {\n return pair;\n }\n }, null)[1];\n}\n\nexport function pick(obj, keys) {\n return keys.reduce((a, k) => {\n a[k] = obj[k];\n return a;\n }, {});\n}\n\nexport function hasOwnProperty(obj, prop) {\n return Object.prototype.hasOwnProperty.call(obj, prop);\n}\n\n// NUMBERS AND STRINGS\n\nexport function integerBetween(thing, bottom, top) {\n return isInteger(thing) && thing >= bottom && thing <= top;\n}\n\n// x % n but takes the sign of n instead of x\nexport function floorMod(x, n) {\n return x - n * Math.floor(x / n);\n}\n\nexport function padStart(input, n = 2) {\n if (input.toString().length < n) {\n return (\"0\".repeat(n) + input).slice(-n);\n } else {\n return input.toString();\n }\n}\n\nexport function parseInteger(string) {\n if (isUndefined(string) || string === null || string === \"\") {\n return undefined;\n } else {\n return parseInt(string, 10);\n }\n}\n\nexport function parseMillis(fraction) {\n // Return undefined (instead of 0) in these cases, where fraction is not set\n if (isUndefined(fraction) || fraction === null || fraction === \"\") {\n return undefined;\n } else {\n const f = parseFloat(\"0.\" + fraction) * 1000;\n return Math.floor(f);\n }\n}\n\nexport function roundTo(number, digits, towardZero = false) {\n const factor = 10 ** digits,\n rounder = towardZero ? Math.trunc : Math.round;\n return rounder(number * factor) / factor;\n}\n\n// DATE BASICS\n\nexport function isLeapYear(year) {\n return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);\n}\n\nexport function daysInYear(year) {\n return isLeapYear(year) ? 366 : 365;\n}\n\nexport function daysInMonth(year, month) {\n const modMonth = floorMod(month - 1, 12) + 1,\n modYear = year + (month - modMonth) / 12;\n\n if (modMonth === 2) {\n return isLeapYear(modYear) ? 29 : 28;\n } else {\n return [31, null, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][modMonth - 1];\n }\n}\n\n// covert a calendar object to a local timestamp (epoch, but with the offset baked in)\nexport function objToLocalTS(obj) {\n let d = Date.UTC(\n obj.year,\n obj.month - 1,\n obj.day,\n obj.hour,\n obj.minute,\n obj.second,\n obj.millisecond\n );\n\n // for legacy reasons, years between 0 and 99 are interpreted as 19XX; revert that\n if (obj.year < 100 && obj.year >= 0) {\n d = new Date(d);\n d.setUTCFullYear(d.getUTCFullYear() - 1900);\n }\n return +d;\n}\n\nexport function weeksInWeekYear(weekYear) {\n const p1 =\n (weekYear +\n Math.floor(weekYear / 4) -\n Math.floor(weekYear / 100) +\n Math.floor(weekYear / 400)) %\n 7,\n last = weekYear - 1,\n p2 = (last + Math.floor(last / 4) - Math.floor(last / 100) + Math.floor(last / 400)) % 7;\n return p1 === 4 || p2 === 3 ? 53 : 52;\n}\n\nexport function untruncateYear(year) {\n if (year > 99) {\n return year;\n } else return year > 60 ? 1900 + year : 2000 + year;\n}\n\n// PARSING\n\nexport function parseZoneInfo(ts, offsetFormat, locale, timeZone = null) {\n const date = new Date(ts),\n intlOpts = {\n hour12: false,\n year: \"numeric\",\n month: \"2-digit\",\n day: \"2-digit\",\n hour: \"2-digit\",\n minute: \"2-digit\"\n };\n\n if (timeZone) {\n intlOpts.timeZone = timeZone;\n }\n\n const modified = Object.assign({ timeZoneName: offsetFormat }, intlOpts),\n intl = hasIntl();\n\n if (intl && hasFormatToParts()) {\n const parsed = new Intl.DateTimeFormat(locale, modified)\n .formatToParts(date)\n .find(m => m.type.toLowerCase() === \"timezonename\");\n return parsed ? parsed.value : null;\n } else if (intl) {\n // this probably doesn't work for all locales\n const without = new Intl.DateTimeFormat(locale, intlOpts).format(date),\n included = new Intl.DateTimeFormat(locale, modified).format(date),\n diffed = included.substring(without.length),\n trimmed = diffed.replace(/^[, \\u200e]+/, \"\");\n return trimmed;\n } else {\n return null;\n }\n}\n\n// signedOffset('-5', '30') -> -330\nexport function signedOffset(offHourStr, offMinuteStr) {\n const offHour = parseInt(offHourStr, 10) || 0,\n offMin = parseInt(offMinuteStr, 10) || 0,\n offMinSigned = offHour < 0 ? -offMin : offMin;\n return offHour * 60 + offMinSigned;\n}\n\n// COERCION\n\nfunction asNumber(value) {\n const numericValue = Number(value);\n if (typeof value === \"boolean\" || value === \"\" || Number.isNaN(numericValue))\n throw new InvalidArgumentError(`Invalid unit value ${value}`);\n return numericValue;\n}\n\nexport function normalizeObject(obj, normalizer, nonUnitKeys) {\n const normalized = {};\n for (const u in obj) {\n if (hasOwnProperty(obj, u)) {\n if (nonUnitKeys.indexOf(u) >= 0) continue;\n const v = obj[u];\n if (v === undefined || v === null) continue;\n normalized[normalizer(u)] = asNumber(v);\n }\n }\n return normalized;\n}\n\nexport function formatOffset(offset, format) {\n const hours = Math.trunc(offset / 60),\n minutes = Math.abs(offset % 60),\n sign = hours >= 0 ? \"+\" : \"-\",\n base = `${sign}${Math.abs(hours)}`;\n\n switch (format) {\n case \"short\":\n return `${sign}${padStart(Math.abs(hours), 2)}:${padStart(minutes, 2)}`;\n case \"narrow\":\n return minutes > 0 ? `${base}:${minutes}` : base;\n case \"techie\":\n return `${sign}${padStart(Math.abs(hours), 2)}${padStart(minutes, 2)}`;\n default:\n throw new RangeError(`Value format ${format} is out of range for property format`);\n }\n}\n\nexport function timeObject(obj) {\n return pick(obj, [\"hour\", \"minute\", \"second\", \"millisecond\"]);\n}\n\nexport const ianaRegex = /[A-Za-z_+-]{1,256}(:?\\/[A-Za-z_+-]{1,256}(\\/[A-Za-z_+-]{1,256})?)?/;\n","/**\n * @private\n */\n\nconst n = \"numeric\",\n s = \"short\",\n l = \"long\",\n d2 = \"2-digit\";\n\nexport const DATE_SHORT = {\n year: n,\n month: n,\n day: n\n};\n\nexport const DATE_MED = {\n year: n,\n month: s,\n day: n\n};\n\nexport const DATE_FULL = {\n year: n,\n month: l,\n day: n\n};\n\nexport const DATE_HUGE = {\n year: n,\n month: l,\n day: n,\n weekday: l\n};\n\nexport const TIME_SIMPLE = {\n hour: n,\n minute: d2\n};\n\nexport const TIME_WITH_SECONDS = {\n hour: n,\n minute: d2,\n second: d2\n};\n\nexport const TIME_WITH_SHORT_OFFSET = {\n hour: n,\n minute: d2,\n second: d2,\n timeZoneName: s\n};\n\nexport const TIME_WITH_LONG_OFFSET = {\n hour: n,\n minute: d2,\n second: d2,\n timeZoneName: l\n};\n\nexport const TIME_24_SIMPLE = {\n hour: n,\n minute: d2,\n hour12: false\n};\n\n/**\n * {@link toLocaleString}; format like '09:30:23', always 24-hour.\n */\nexport const TIME_24_WITH_SECONDS = {\n hour: n,\n minute: d2,\n second: d2,\n hour12: false\n};\n\n/**\n * {@link toLocaleString}; format like '09:30:23 EDT', always 24-hour.\n */\nexport const TIME_24_WITH_SHORT_OFFSET = {\n hour: n,\n minute: d2,\n second: d2,\n hour12: false,\n timeZoneName: s\n};\n\n/**\n * {@link toLocaleString}; format like '09:30:23 Eastern Daylight Time', always 24-hour.\n */\nexport const TIME_24_WITH_LONG_OFFSET = {\n hour: n,\n minute: d2,\n second: d2,\n hour12: false,\n timeZoneName: l\n};\n\n/**\n * {@link toLocaleString}; format like '10/14/1983, 9:30 AM'. Only 12-hour if the locale is.\n */\nexport const DATETIME_SHORT = {\n year: n,\n month: n,\n day: n,\n hour: n,\n minute: d2\n};\n\n/**\n * {@link toLocaleString}; format like '10/14/1983, 9:30:33 AM'. Only 12-hour if the locale is.\n */\nexport const DATETIME_SHORT_WITH_SECONDS = {\n year: n,\n month: n,\n day: n,\n hour: n,\n minute: d2,\n second: d2\n};\n\nexport const DATETIME_MED = {\n year: n,\n month: s,\n day: n,\n hour: n,\n minute: d2\n};\n\nexport const DATETIME_MED_WITH_SECONDS = {\n year: n,\n month: s,\n day: n,\n hour: n,\n minute: d2,\n second: d2\n};\n\nexport const DATETIME_MED_WITH_WEEKDAY = {\n year: n,\n month: s,\n day: n,\n weekday: s,\n hour: n,\n minute: d2\n};\n\nexport const DATETIME_FULL = {\n year: n,\n month: l,\n day: n,\n hour: n,\n minute: d2,\n timeZoneName: s\n};\n\nexport const DATETIME_FULL_WITH_SECONDS = {\n year: n,\n month: l,\n day: n,\n hour: n,\n minute: d2,\n second: d2,\n timeZoneName: s\n};\n\nexport const DATETIME_HUGE = {\n year: n,\n month: l,\n day: n,\n weekday: l,\n hour: n,\n minute: d2,\n timeZoneName: l\n};\n\nexport const DATETIME_HUGE_WITH_SECONDS = {\n year: n,\n month: l,\n day: n,\n weekday: l,\n hour: n,\n minute: d2,\n second: d2,\n timeZoneName: l\n};\n","import * as Formats from \"./formats.js\";\nimport { pick } from \"./util.js\";\n\nfunction stringify(obj) {\n return JSON.stringify(obj, Object.keys(obj).sort());\n}\n\n/**\n * @private\n */\n\nexport const monthsLong = [\n \"January\",\n \"February\",\n \"March\",\n \"April\",\n \"May\",\n \"June\",\n \"July\",\n \"August\",\n \"September\",\n \"October\",\n \"November\",\n \"December\"\n];\n\nexport const monthsShort = [\n \"Jan\",\n \"Feb\",\n \"Mar\",\n \"Apr\",\n \"May\",\n \"Jun\",\n \"Jul\",\n \"Aug\",\n \"Sep\",\n \"Oct\",\n \"Nov\",\n \"Dec\"\n];\n\nexport const monthsNarrow = [\"J\", \"F\", \"M\", \"A\", \"M\", \"J\", \"J\", \"A\", \"S\", \"O\", \"N\", \"D\"];\n\nexport function months(length) {\n switch (length) {\n case \"narrow\":\n return monthsNarrow;\n case \"short\":\n return monthsShort;\n case \"long\":\n return monthsLong;\n case \"numeric\":\n return [\"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\"];\n case \"2-digit\":\n return [\"01\", \"02\", \"03\", \"04\", \"05\", \"06\", \"07\", \"08\", \"09\", \"10\", \"11\", \"12\"];\n default:\n return null;\n }\n}\n\nexport const weekdaysLong = [\n \"Monday\",\n \"Tuesday\",\n \"Wednesday\",\n \"Thursday\",\n \"Friday\",\n \"Saturday\",\n \"Sunday\"\n];\n\nexport const weekdaysShort = [\"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\"];\n\nexport const weekdaysNarrow = [\"M\", \"T\", \"W\", \"T\", \"F\", \"S\", \"S\"];\n\nexport function weekdays(length) {\n switch (length) {\n case \"narrow\":\n return weekdaysNarrow;\n case \"short\":\n return weekdaysShort;\n case \"long\":\n return weekdaysLong;\n case \"numeric\":\n return [\"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\"];\n default:\n return null;\n }\n}\n\nexport const meridiems = [\"AM\", \"PM\"];\n\nexport const erasLong = [\"Before Christ\", \"Anno Domini\"];\n\nexport const erasShort = [\"BC\", \"AD\"];\n\nexport const erasNarrow = [\"B\", \"A\"];\n\nexport function eras(length) {\n switch (length) {\n case \"narrow\":\n return erasNarrow;\n case \"short\":\n return erasShort;\n case \"long\":\n return erasLong;\n default:\n return null;\n }\n}\n\nexport function meridiemForDateTime(dt) {\n return meridiems[dt.hour < 12 ? 0 : 1];\n}\n\nexport function weekdayForDateTime(dt, length) {\n return weekdays(length)[dt.weekday - 1];\n}\n\nexport function monthForDateTime(dt, length) {\n return months(length)[dt.month - 1];\n}\n\nexport function eraForDateTime(dt, length) {\n return eras(length)[dt.year < 0 ? 0 : 1];\n}\n\nexport function formatRelativeTime(unit, count, numeric = \"always\", narrow = false) {\n const units = {\n years: [\"year\", \"yr.\"],\n quarters: [\"quarter\", \"qtr.\"],\n months: [\"month\", \"mo.\"],\n weeks: [\"week\", \"wk.\"],\n days: [\"day\", \"day\", \"days\"],\n hours: [\"hour\", \"hr.\"],\n minutes: [\"minute\", \"min.\"],\n seconds: [\"second\", \"sec.\"]\n };\n\n const lastable = [\"hours\", \"minutes\", \"seconds\"].indexOf(unit) === -1;\n\n if (numeric === \"auto\" && lastable) {\n const isDay = unit === \"days\";\n switch (count) {\n case 1:\n return isDay ? \"tomorrow\" : `next ${units[unit][0]}`;\n case -1:\n return isDay ? \"yesterday\" : `last ${units[unit][0]}`;\n case 0:\n return isDay ? \"today\" : `this ${units[unit][0]}`;\n default: // fall through\n }\n }\n\n const isInPast = Object.is(count, -0) || count < 0,\n fmtValue = Math.abs(count),\n singular = fmtValue === 1,\n lilUnits = units[unit],\n fmtUnit = narrow\n ? singular\n ? lilUnits[1]\n : lilUnits[2] || lilUnits[1]\n : singular\n ? units[unit][0]\n : unit;\n return isInPast ? `${fmtValue} ${fmtUnit} ago` : `in ${fmtValue} ${fmtUnit}`;\n}\n\nexport function formatString(knownFormat) {\n // these all have the offsets removed because we don't have access to them\n // without all the intl stuff this is backfilling\n const filtered = pick(knownFormat, [\n \"weekday\",\n \"era\",\n \"year\",\n \"month\",\n \"day\",\n \"hour\",\n \"minute\",\n \"second\",\n \"timeZoneName\",\n \"hour12\"\n ]),\n key = stringify(filtered),\n dateTimeHuge = \"EEEE, LLLL d, yyyy, h:mm a\";\n switch (key) {\n case stringify(Formats.DATE_SHORT):\n return \"M/d/yyyy\";\n case stringify(Formats.DATE_MED):\n return \"LLL d, yyyy\";\n case stringify(Formats.DATE_FULL):\n return \"LLLL d, yyyy\";\n case stringify(Formats.DATE_HUGE):\n return \"EEEE, LLLL d, yyyy\";\n case stringify(Formats.TIME_SIMPLE):\n return \"h:mm a\";\n case stringify(Formats.TIME_WITH_SECONDS):\n return \"h:mm:ss a\";\n case stringify(Formats.TIME_WITH_SHORT_OFFSET):\n return \"h:mm a\";\n case stringify(Formats.TIME_WITH_LONG_OFFSET):\n return \"h:mm a\";\n case stringify(Formats.TIME_24_SIMPLE):\n return \"HH:mm\";\n case stringify(Formats.TIME_24_WITH_SECONDS):\n return \"HH:mm:ss\";\n case stringify(Formats.TIME_24_WITH_SHORT_OFFSET):\n return \"HH:mm\";\n case stringify(Formats.TIME_24_WITH_LONG_OFFSET):\n return \"HH:mm\";\n case stringify(Formats.DATETIME_SHORT):\n return \"M/d/yyyy, h:mm a\";\n case stringify(Formats.DATETIME_MED):\n return \"LLL d, yyyy, h:mm a\";\n case stringify(Formats.DATETIME_FULL):\n return \"LLLL d, yyyy, h:mm a\";\n case stringify(Formats.DATETIME_HUGE):\n return dateTimeHuge;\n case stringify(Formats.DATETIME_SHORT_WITH_SECONDS):\n return \"M/d/yyyy, h:mm:ss a\";\n case stringify(Formats.DATETIME_MED_WITH_SECONDS):\n return \"LLL d, yyyy, h:mm:ss a\";\n case stringify(Formats.DATETIME_MED_WITH_WEEKDAY):\n return \"EEE, d LLL yyyy, h:mm a\";\n case stringify(Formats.DATETIME_FULL_WITH_SECONDS):\n return \"LLLL d, yyyy, h:mm:ss a\";\n case stringify(Formats.DATETIME_HUGE_WITH_SECONDS):\n return \"EEEE, LLLL d, yyyy, h:mm:ss a\";\n default:\n return dateTimeHuge;\n }\n}\n","/* eslint no-unused-vars: \"off\" */\nimport { ZoneIsAbstractError } from \"./errors.js\";\n\n/**\n * @interface\n */\nexport default class Zone {\n /**\n * The type of zone\n * @abstract\n * @type {string}\n */\n get type() {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * The name of this zone.\n * @abstract\n * @type {string}\n */\n get name() {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * Returns whether the offset is known to be fixed for the whole year.\n * @abstract\n * @type {boolean}\n */\n get universal() {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * Returns the offset's common name (such as EST) at the specified timestamp\n * @abstract\n * @param {number} ts - Epoch milliseconds for which to get the name\n * @param {Object} opts - Options to affect the format\n * @param {string} opts.format - What style of offset to return. Accepts 'long' or 'short'.\n * @param {string} opts.locale - What locale to return the offset name in.\n * @return {string}\n */\n offsetName(ts, opts) {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * Returns the offset's value as a string\n * @abstract\n * @param {number} ts - Epoch milliseconds for which to get the offset\n * @param {string} format - What style of offset to return.\n * Accepts 'narrow', 'short', or 'techie'. Returning '+6', '+06:00', or '+0600' respectively\n * @return {string}\n */\n formatOffset(ts, format) {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * Return the offset in minutes for this zone at the specified timestamp.\n * @abstract\n * @param {number} ts - Epoch milliseconds for which to compute the offset\n * @return {number}\n */\n offset(ts) {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * Return whether this Zone is equal to another zone\n * @abstract\n * @param {Zone} otherZone - the zone to compare\n * @return {boolean}\n */\n equals(otherZone) {\n throw new ZoneIsAbstractError();\n }\n\n /**\n * Return whether this Zone is valid.\n * @abstract\n * @type {boolean}\n */\n get isValid() {\n throw new ZoneIsAbstractError();\n }\n}\n","import { formatOffset, parseZoneInfo, hasIntl } from \"../impl/util.js\";\nimport Zone from \"../zone.js\";\n\nlet singleton = null;\n\n/**\n * Represents the local zone for this Javascript environment.\n * @implements {Zone}\n */\nexport default class LocalZone extends Zone {\n /**\n * Get a singleton instance of the local zone\n * @return {LocalZone}\n */\n static get instance() {\n if (singleton === null) {\n singleton = new LocalZone();\n }\n return singleton;\n }\n\n /** @override **/\n get type() {\n return \"local\";\n }\n\n /** @override **/\n get name() {\n if (hasIntl()) {\n return new Intl.DateTimeFormat().resolvedOptions().timeZone;\n } else return \"local\";\n }\n\n /** @override **/\n get universal() {\n return false;\n }\n\n /** @override **/\n offsetName(ts, { format, locale }) {\n return parseZoneInfo(ts, format, locale);\n }\n\n /** @override **/\n formatOffset(ts, format) {\n return formatOffset(this.offset(ts), format);\n }\n\n /** @override **/\n offset(ts) {\n return -new Date(ts).getTimezoneOffset();\n }\n\n /** @override **/\n equals(otherZone) {\n return otherZone.type === \"local\";\n }\n\n /** @override **/\n get isValid() {\n return true;\n }\n}\n","import { formatOffset, parseZoneInfo, isUndefined, ianaRegex, objToLocalTS } from \"../impl/util.js\";\nimport Zone from \"../zone.js\";\n\nconst matchingRegex = RegExp(`^${ianaRegex.source}$`);\n\nlet dtfCache = {};\nfunction makeDTF(zone) {\n if (!dtfCache[zone]) {\n dtfCache[zone] = new Intl.DateTimeFormat(\"en-US\", {\n hour12: false,\n timeZone: zone,\n year: \"numeric\",\n month: \"2-digit\",\n day: \"2-digit\",\n hour: \"2-digit\",\n minute: \"2-digit\",\n second: \"2-digit\"\n });\n }\n return dtfCache[zone];\n}\n\nconst typeToPos = {\n year: 0,\n month: 1,\n day: 2,\n hour: 3,\n minute: 4,\n second: 5\n};\n\nfunction hackyOffset(dtf, date) {\n const formatted = dtf.format(date).replace(/\\u200E/g, \"\"),\n parsed = /(\\d+)\\/(\\d+)\\/(\\d+),? (\\d+):(\\d+):(\\d+)/.exec(formatted),\n [, fMonth, fDay, fYear, fHour, fMinute, fSecond] = parsed;\n return [fYear, fMonth, fDay, fHour, fMinute, fSecond];\n}\n\nfunction partsOffset(dtf, date) {\n const formatted = dtf.formatToParts(date),\n filled = [];\n for (let i = 0; i < formatted.length; i++) {\n const { type, value } = formatted[i],\n pos = typeToPos[type];\n\n if (!isUndefined(pos)) {\n filled[pos] = parseInt(value, 10);\n }\n }\n return filled;\n}\n\nlet ianaZoneCache = {};\n/**\n * A zone identified by an IANA identifier, like America/New_York\n * @implements {Zone}\n */\nexport default class IANAZone extends Zone {\n /**\n * @param {string} name - Zone name\n * @return {IANAZone}\n */\n static create(name) {\n if (!ianaZoneCache[name]) {\n ianaZoneCache[name] = new IANAZone(name);\n }\n return ianaZoneCache[name];\n }\n\n /**\n * Reset local caches. Should only be necessary in testing scenarios.\n * @return {void}\n */\n static resetCache() {\n ianaZoneCache = {};\n dtfCache = {};\n }\n\n /**\n * Returns whether the provided string is a valid specifier. This only checks the string's format, not that the specifier identifies a known zone; see isValidZone for that.\n * @param {string} s - The string to check validity on\n * @example IANAZone.isValidSpecifier(\"America/New_York\") //=> true\n * @example IANAZone.isValidSpecifier(\"Fantasia/Castle\") //=> true\n * @example IANAZone.isValidSpecifier(\"Sport~~blorp\") //=> false\n * @return {boolean}\n */\n static isValidSpecifier(s) {\n return !!(s && s.match(matchingRegex));\n }\n\n /**\n * Returns whether the provided string identifies a real zone\n * @param {string} zone - The string to check\n * @example IANAZone.isValidZone(\"America/New_York\") //=> true\n * @example IANAZone.isValidZone(\"Fantasia/Castle\") //=> false\n * @example IANAZone.isValidZone(\"Sport~~blorp\") //=> false\n * @return {boolean}\n */\n static isValidZone(zone) {\n try {\n new Intl.DateTimeFormat(\"en-US\", { timeZone: zone }).format();\n return true;\n } catch (e) {\n return false;\n }\n }\n\n // Etc/GMT+8 -> -480\n /** @ignore */\n static parseGMTOffset(specifier) {\n if (specifier) {\n const match = specifier.match(/^Etc\\/GMT([+-]\\d{1,2})$/i);\n if (match) {\n return -60 * parseInt(match[1]);\n }\n }\n return null;\n }\n\n constructor(name) {\n super();\n /** @private **/\n this.zoneName = name;\n /** @private **/\n this.valid = IANAZone.isValidZone(name);\n }\n\n /** @override **/\n get type() {\n return \"iana\";\n }\n\n /** @override **/\n get name() {\n return this.zoneName;\n }\n\n /** @override **/\n get universal() {\n return false;\n }\n\n /** @override **/\n offsetName(ts, { format, locale }) {\n return parseZoneInfo(ts, format, locale, this.name);\n }\n\n /** @override **/\n formatOffset(ts, format) {\n return formatOffset(this.offset(ts), format);\n }\n\n /** @override **/\n offset(ts) {\n const date = new Date(ts),\n dtf = makeDTF(this.name),\n [year, month, day, hour, minute, second] = dtf.formatToParts\n ? partsOffset(dtf, date)\n : hackyOffset(dtf, date);\n const asUTC = objToLocalTS({ year, month, day, hour, minute, second, millisecond: 0 });\n let asTS = date.valueOf();\n asTS -= asTS % 1000;\n return (asUTC - asTS) / (60 * 1000);\n }\n\n /** @override **/\n equals(otherZone) {\n return otherZone.type === \"iana\" && otherZone.name === this.name;\n }\n\n /** @override **/\n get isValid() {\n return this.valid;\n }\n}\n","import { formatOffset, signedOffset } from \"../impl/util.js\";\nimport Zone from \"../zone.js\";\n\nlet singleton = null;\n\n/**\n * A zone with a fixed offset (i.e. no DST)\n * @implements {Zone}\n */\nexport default class FixedOffsetZone extends Zone {\n /**\n * Get a singleton instance of UTC\n * @return {FixedOffsetZone}\n */\n static get utcInstance() {\n if (singleton === null) {\n singleton = new FixedOffsetZone(0);\n }\n return singleton;\n }\n\n /**\n * Get an instance with a specified offset\n * @param {number} offset - The offset in minutes\n * @return {FixedOffsetZone}\n */\n static instance(offset) {\n return offset === 0 ? FixedOffsetZone.utcInstance : new FixedOffsetZone(offset);\n }\n\n /**\n * Get an instance of FixedOffsetZone from a UTC offset string, like \"UTC+6\"\n * @param {string} s - The offset string to parse\n * @example FixedOffsetZone.parseSpecifier(\"UTC+6\")\n * @example FixedOffsetZone.parseSpecifier(\"UTC+06\")\n * @example FixedOffsetZone.parseSpecifier(\"UTC-6:00\")\n * @return {FixedOffsetZone}\n */\n static parseSpecifier(s) {\n if (s) {\n const r = s.match(/^utc(?:([+-]\\d{1,2})(?::(\\d{2}))?)?$/i);\n if (r) {\n return new FixedOffsetZone(signedOffset(r[1], r[2]));\n }\n }\n return null;\n }\n\n constructor(offset) {\n super();\n /** @private **/\n this.fixed = offset;\n }\n\n /** @override **/\n get type() {\n return \"fixed\";\n }\n\n /** @override **/\n get name() {\n return this.fixed === 0 ? \"UTC\" : `UTC${formatOffset(this.fixed, \"narrow\")}`;\n }\n\n /** @override **/\n offsetName() {\n return this.name;\n }\n\n /** @override **/\n formatOffset(ts, format) {\n return formatOffset(this.fixed, format);\n }\n\n /** @override **/\n get universal() {\n return true;\n }\n\n /** @override **/\n offset() {\n return this.fixed;\n }\n\n /** @override **/\n equals(otherZone) {\n return otherZone.type === \"fixed\" && otherZone.fixed === this.fixed;\n }\n\n /** @override **/\n get isValid() {\n return true;\n }\n}\n","import Zone from \"../zone.js\";\n\n/**\n * A zone that failed to parse. You should never need to instantiate this.\n * @implements {Zone}\n */\nexport default class InvalidZone extends Zone {\n constructor(zoneName) {\n super();\n /** @private */\n this.zoneName = zoneName;\n }\n\n /** @override **/\n get type() {\n return \"invalid\";\n }\n\n /** @override **/\n get name() {\n return this.zoneName;\n }\n\n /** @override **/\n get universal() {\n return false;\n }\n\n /** @override **/\n offsetName() {\n return null;\n }\n\n /** @override **/\n formatOffset() {\n return \"\";\n }\n\n /** @override **/\n offset() {\n return NaN;\n }\n\n /** @override **/\n equals() {\n return false;\n }\n\n /** @override **/\n get isValid() {\n return false;\n }\n}\n","/**\n * @private\n */\n\nimport Zone from \"../zone.js\";\nimport IANAZone from \"../zones/IANAZone.js\";\nimport FixedOffsetZone from \"../zones/fixedOffsetZone.js\";\nimport InvalidZone from \"../zones/invalidZone.js\";\n\nimport { isUndefined, isString, isNumber } from \"./util.js\";\n\nexport function normalizeZone(input, defaultZone) {\n let offset;\n if (isUndefined(input) || input === null) {\n return defaultZone;\n } else if (input instanceof Zone) {\n return input;\n } else if (isString(input)) {\n const lowered = input.toLowerCase();\n if (lowered === \"local\") return defaultZone;\n else if (lowered === \"utc\" || lowered === \"gmt\") return FixedOffsetZone.utcInstance;\n else if ((offset = IANAZone.parseGMTOffset(input)) != null) {\n // handle Etc/GMT-4, which V8 chokes on\n return FixedOffsetZone.instance(offset);\n } else if (IANAZone.isValidSpecifier(lowered)) return IANAZone.create(input);\n else return FixedOffsetZone.parseSpecifier(lowered) || new InvalidZone(input);\n } else if (isNumber(input)) {\n return FixedOffsetZone.instance(input);\n } else if (typeof input === \"object\" && input.offset && typeof input.offset === \"number\") {\n // This is dumb, but the instanceof check above doesn't seem to really work\n // so we're duck checking it\n return input;\n } else {\n return new InvalidZone(input);\n }\n}\n","import LocalZone from \"./zones/localZone.js\";\nimport IANAZone from \"./zones/IANAZone.js\";\nimport Locale from \"./impl/locale.js\";\n\nimport { normalizeZone } from \"./impl/zoneUtil.js\";\n\nlet now = () => Date.now(),\n defaultZone = null, // not setting this directly to LocalZone.instance bc loading order issues\n defaultLocale = null,\n defaultNumberingSystem = null,\n defaultOutputCalendar = null,\n throwOnInvalid = false;\n\n/**\n * Settings contains static getters and setters that control Luxon's overall behavior. Luxon is a simple library with few options, but the ones it does have live here.\n */\nexport default class Settings {\n /**\n * Get the callback for returning the current timestamp.\n * @type {function}\n */\n static get now() {\n return now;\n }\n\n /**\n * Set the callback for returning the current timestamp.\n * The function should return a number, which will be interpreted as an Epoch millisecond count\n * @type {function}\n * @example Settings.now = () => Date.now() + 3000 // pretend it is 3 seconds in the future\n * @example Settings.now = () => 0 // always pretend it's Jan 1, 1970 at midnight in UTC time\n */\n static set now(n) {\n now = n;\n }\n\n /**\n * Get the default time zone to create DateTimes in.\n * @type {string}\n */\n static get defaultZoneName() {\n return Settings.defaultZone.name;\n }\n\n /**\n * Set the default time zone to create DateTimes in. Does not affect existing instances.\n * @type {string}\n */\n static set defaultZoneName(z) {\n if (!z) {\n defaultZone = null;\n } else {\n defaultZone = normalizeZone(z);\n }\n }\n\n /**\n * Get the default time zone object to create DateTimes in. Does not affect existing instances.\n * @type {Zone}\n */\n static get defaultZone() {\n return defaultZone || LocalZone.instance;\n }\n\n /**\n * Get the default locale to create DateTimes with. Does not affect existing instances.\n * @type {string}\n */\n static get defaultLocale() {\n return defaultLocale;\n }\n\n /**\n * Set the default locale to create DateTimes with. Does not affect existing instances.\n * @type {string}\n */\n static set defaultLocale(locale) {\n defaultLocale = locale;\n }\n\n /**\n * Get the default numbering system to create DateTimes with. Does not affect existing instances.\n * @type {string}\n */\n static get defaultNumberingSystem() {\n return defaultNumberingSystem;\n }\n\n /**\n * Set the default numbering system to create DateTimes with. Does not affect existing instances.\n * @type {string}\n */\n static set defaultNumberingSystem(numberingSystem) {\n defaultNumberingSystem = numberingSystem;\n }\n\n /**\n * Get the default output calendar to create DateTimes with. Does not affect existing instances.\n * @type {string}\n */\n static get defaultOutputCalendar() {\n return defaultOutputCalendar;\n }\n\n /**\n * Set the default output calendar to create DateTimes with. Does not affect existing instances.\n * @type {string}\n */\n static set defaultOutputCalendar(outputCalendar) {\n defaultOutputCalendar = outputCalendar;\n }\n\n /**\n * Get whether Luxon will throw when it encounters invalid DateTimes, Durations, or Intervals\n * @type {boolean}\n */\n static get throwOnInvalid() {\n return throwOnInvalid;\n }\n\n /**\n * Set whether Luxon will throw when it encounters invalid DateTimes, Durations, or Intervals\n * @type {boolean}\n */\n static set throwOnInvalid(t) {\n throwOnInvalid = t;\n }\n\n /**\n * Reset Luxon's global caches. Should only be necessary in testing scenarios.\n * @return {void}\n */\n static resetCaches() {\n Locale.resetCache();\n IANAZone.resetCache();\n }\n}\n","import * as English from \"./english.js\";\nimport * as Formats from \"./formats.js\";\nimport { hasFormatToParts, padStart } from \"./util.js\";\n\nfunction stringifyTokens(splits, tokenToString) {\n let s = \"\";\n for (const token of splits) {\n if (token.literal) {\n s += token.val;\n } else {\n s += tokenToString(token.val);\n }\n }\n return s;\n}\n\nconst macroTokenToFormatOpts = {\n D: Formats.DATE_SHORT,\n DD: Formats.DATE_MED,\n DDD: Formats.DATE_FULL,\n DDDD: Formats.DATE_HUGE,\n t: Formats.TIME_SIMPLE,\n tt: Formats.TIME_WITH_SECONDS,\n ttt: Formats.TIME_WITH_SHORT_OFFSET,\n tttt: Formats.TIME_WITH_LONG_OFFSET,\n T: Formats.TIME_24_SIMPLE,\n TT: Formats.TIME_24_WITH_SECONDS,\n TTT: Formats.TIME_24_WITH_SHORT_OFFSET,\n TTTT: Formats.TIME_24_WITH_LONG_OFFSET,\n f: Formats.DATETIME_SHORT,\n ff: Formats.DATETIME_MED,\n fff: Formats.DATETIME_FULL,\n ffff: Formats.DATETIME_HUGE,\n F: Formats.DATETIME_SHORT_WITH_SECONDS,\n FF: Formats.DATETIME_MED_WITH_SECONDS,\n FFF: Formats.DATETIME_FULL_WITH_SECONDS,\n FFFF: Formats.DATETIME_HUGE_WITH_SECONDS\n};\n\n/**\n * @private\n */\n\nexport default class Formatter {\n static create(locale, opts = {}) {\n return new Formatter(locale, opts);\n }\n\n static parseFormat(fmt) {\n let current = null,\n currentFull = \"\",\n bracketed = false;\n const splits = [];\n for (let i = 0; i < fmt.length; i++) {\n const c = fmt.charAt(i);\n if (c === \"'\") {\n if (currentFull.length > 0) {\n splits.push({ literal: bracketed, val: currentFull });\n }\n current = null;\n currentFull = \"\";\n bracketed = !bracketed;\n } else if (bracketed) {\n currentFull += c;\n } else if (c === current) {\n currentFull += c;\n } else {\n if (currentFull.length > 0) {\n splits.push({ literal: false, val: currentFull });\n }\n currentFull = c;\n current = c;\n }\n }\n\n if (currentFull.length > 0) {\n splits.push({ literal: bracketed, val: currentFull });\n }\n\n return splits;\n }\n\n static macroTokenToFormatOpts(token) {\n return macroTokenToFormatOpts[token];\n }\n\n constructor(locale, formatOpts) {\n this.opts = formatOpts;\n this.loc = locale;\n this.systemLoc = null;\n }\n\n formatWithSystemDefault(dt, opts) {\n if (this.systemLoc === null) {\n this.systemLoc = this.loc.redefaultToSystem();\n }\n const df = this.systemLoc.dtFormatter(dt, Object.assign({}, this.opts, opts));\n return df.format();\n }\n\n formatDateTime(dt, opts = {}) {\n const df = this.loc.dtFormatter(dt, Object.assign({}, this.opts, opts));\n return df.format();\n }\n\n formatDateTimeParts(dt, opts = {}) {\n const df = this.loc.dtFormatter(dt, Object.assign({}, this.opts, opts));\n return df.formatToParts();\n }\n\n resolvedOptions(dt, opts = {}) {\n const df = this.loc.dtFormatter(dt, Object.assign({}, this.opts, opts));\n return df.resolvedOptions();\n }\n\n num(n, p = 0) {\n // we get some perf out of doing this here, annoyingly\n if (this.opts.forceSimple) {\n return padStart(n, p);\n }\n\n const opts = Object.assign({}, this.opts);\n\n if (p > 0) {\n opts.padTo = p;\n }\n\n return this.loc.numberFormatter(opts).format(n);\n }\n\n formatDateTimeFromString(dt, fmt) {\n const knownEnglish = this.loc.listingMode() === \"en\",\n useDateTimeFormatter =\n this.loc.outputCalendar && this.loc.outputCalendar !== \"gregory\" && hasFormatToParts(),\n string = (opts, extract) => this.loc.extract(dt, opts, extract),\n formatOffset = opts => {\n if (dt.isOffsetFixed && dt.offset === 0 && opts.allowZ) {\n return \"Z\";\n }\n\n return dt.isValid ? dt.zone.formatOffset(dt.ts, opts.format) : \"\";\n },\n meridiem = () =>\n knownEnglish\n ? English.meridiemForDateTime(dt)\n : string({ hour: \"numeric\", hour12: true }, \"dayperiod\"),\n month = (length, standalone) =>\n knownEnglish\n ? English.monthForDateTime(dt, length)\n : string(standalone ? { month: length } : { month: length, day: \"numeric\" }, \"month\"),\n weekday = (length, standalone) =>\n knownEnglish\n ? English.weekdayForDateTime(dt, length)\n : string(\n standalone ? { weekday: length } : { weekday: length, month: \"long\", day: \"numeric\" },\n \"weekday\"\n ),\n maybeMacro = token => {\n const formatOpts = Formatter.macroTokenToFormatOpts(token);\n if (formatOpts) {\n return this.formatWithSystemDefault(dt, formatOpts);\n } else {\n return token;\n }\n },\n era = length =>\n knownEnglish ? English.eraForDateTime(dt, length) : string({ era: length }, \"era\"),\n tokenToString = token => {\n // Where possible: http://cldr.unicode.org/translation/date-time#TOC-Stand-Alone-vs.-Format-Styles\n switch (token) {\n // ms\n case \"S\":\n return this.num(dt.millisecond);\n case \"u\":\n // falls through\n case \"SSS\":\n return this.num(dt.millisecond, 3);\n // seconds\n case \"s\":\n return this.num(dt.second);\n case \"ss\":\n return this.num(dt.second, 2);\n // minutes\n case \"m\":\n return this.num(dt.minute);\n case \"mm\":\n return this.num(dt.minute, 2);\n // hours\n case \"h\":\n return this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12);\n case \"hh\":\n return this.num(dt.hour % 12 === 0 ? 12 : dt.hour % 12, 2);\n case \"H\":\n return this.num(dt.hour);\n case \"HH\":\n return this.num(dt.hour, 2);\n // offset\n case \"Z\":\n // like +6\n return formatOffset({ format: \"narrow\", allowZ: this.opts.allowZ });\n case \"ZZ\":\n // like +06:00\n return formatOffset({ format: \"short\", allowZ: this.opts.allowZ });\n case \"ZZZ\":\n // like +0600\n return formatOffset({ format: \"techie\", allowZ: false });\n case \"ZZZZ\":\n // like EST\n return dt.zone.offsetName(dt.ts, { format: \"short\", locale: this.loc.locale });\n case \"ZZZZZ\":\n // like Eastern Standard Time\n return dt.zone.offsetName(dt.ts, { format: \"long\", locale: this.loc.locale });\n // zone\n case \"z\":\n // like America/New_York\n return dt.zoneName;\n // meridiems\n case \"a\":\n return meridiem();\n // dates\n case \"d\":\n return useDateTimeFormatter ? string({ day: \"numeric\" }, \"day\") : this.num(dt.day);\n case \"dd\":\n return useDateTimeFormatter ? string({ day: \"2-digit\" }, \"day\") : this.num(dt.day, 2);\n // weekdays - standalone\n case \"c\":\n // like 1\n return this.num(dt.weekday);\n case \"ccc\":\n // like 'Tues'\n return weekday(\"short\", true);\n case \"cccc\":\n // like 'Tuesday'\n return weekday(\"long\", true);\n case \"ccccc\":\n // like 'T'\n return weekday(\"narrow\", true);\n // weekdays - format\n case \"E\":\n // like 1\n return this.num(dt.weekday);\n case \"EEE\":\n // like 'Tues'\n return weekday(\"short\", false);\n case \"EEEE\":\n // like 'Tuesday'\n return weekday(\"long\", false);\n case \"EEEEE\":\n // like 'T'\n return weekday(\"narrow\", false);\n // months - standalone\n case \"L\":\n // like 1\n return useDateTimeFormatter\n ? string({ month: \"numeric\", day: \"numeric\" }, \"month\")\n : this.num(dt.month);\n case \"LL\":\n // like 01, doesn't seem to work\n return useDateTimeFormatter\n ? string({ month: \"2-digit\", day: \"numeric\" }, \"month\")\n : this.num(dt.month, 2);\n case \"LLL\":\n // like Jan\n return month(\"short\", true);\n case \"LLLL\":\n // like January\n return month(\"long\", true);\n case \"LLLLL\":\n // like J\n return month(\"narrow\", true);\n // months - format\n case \"M\":\n // like 1\n return useDateTimeFormatter\n ? string({ month: \"numeric\" }, \"month\")\n : this.num(dt.month);\n case \"MM\":\n // like 01\n return useDateTimeFormatter\n ? string({ month: \"2-digit\" }, \"month\")\n : this.num(dt.month, 2);\n case \"MMM\":\n // like Jan\n return month(\"short\", false);\n case \"MMMM\":\n // like January\n return month(\"long\", false);\n case \"MMMMM\":\n // like J\n return month(\"narrow\", false);\n // years\n case \"y\":\n // like 2014\n return useDateTimeFormatter ? string({ year: \"numeric\" }, \"year\") : this.num(dt.year);\n case \"yy\":\n // like 14\n return useDateTimeFormatter\n ? string({ year: \"2-digit\" }, \"year\")\n : this.num(dt.year.toString().slice(-2), 2);\n case \"yyyy\":\n // like 0012\n return useDateTimeFormatter\n ? string({ year: \"numeric\" }, \"year\")\n : this.num(dt.year, 4);\n case \"yyyyyy\":\n // like 000012\n return useDateTimeFormatter\n ? string({ year: \"numeric\" }, \"year\")\n : this.num(dt.year, 6);\n // eras\n case \"G\":\n // like AD\n return era(\"short\");\n case \"GG\":\n // like Anno Domini\n return era(\"long\");\n case \"GGGGG\":\n return era(\"narrow\");\n case \"kk\":\n return this.num(dt.weekYear.toString().slice(-2), 2);\n case \"kkkk\":\n return this.num(dt.weekYear, 4);\n case \"W\":\n return this.num(dt.weekNumber);\n case \"WW\":\n return this.num(dt.weekNumber, 2);\n case \"o\":\n return this.num(dt.ordinal);\n case \"ooo\":\n return this.num(dt.ordinal, 3);\n case \"q\":\n // like 1\n return this.num(dt.quarter);\n case \"qq\":\n // like 01\n return this.num(dt.quarter, 2);\n case \"X\":\n return this.num(Math.floor(dt.ts / 1000));\n case \"x\":\n return this.num(dt.ts);\n default:\n return maybeMacro(token);\n }\n };\n\n return stringifyTokens(Formatter.parseFormat(fmt), tokenToString);\n }\n\n formatDurationFromString(dur, fmt) {\n const tokenToField = token => {\n switch (token[0]) {\n case \"S\":\n return \"millisecond\";\n case \"s\":\n return \"second\";\n case \"m\":\n return \"minute\";\n case \"h\":\n return \"hour\";\n case \"d\":\n return \"day\";\n case \"M\":\n return \"month\";\n case \"y\":\n return \"year\";\n default:\n return null;\n }\n },\n tokenToString = lildur => token => {\n const mapped = tokenToField(token);\n if (mapped) {\n return this.num(lildur.get(mapped), token.length);\n } else {\n return token;\n }\n },\n tokens = Formatter.parseFormat(fmt),\n realTokens = tokens.reduce(\n (found, { literal, val }) => (literal ? found : found.concat(val)),\n []\n ),\n collapsed = dur.shiftTo(...realTokens.map(tokenToField).filter(t => t));\n return stringifyTokens(tokens, tokenToString(collapsed));\n }\n}\n","import { hasFormatToParts, hasIntl, padStart, roundTo, hasRelative } from \"./util.js\";\nimport * as English from \"./english.js\";\nimport Settings from \"../settings.js\";\nimport DateTime from \"../datetime.js\";\nimport Formatter from \"./formatter.js\";\n\nlet intlDTCache = {};\nfunction getCachedDTF(locString, opts = {}) {\n const key = JSON.stringify([locString, opts]);\n let dtf = intlDTCache[key];\n if (!dtf) {\n dtf = new Intl.DateTimeFormat(locString, opts);\n intlDTCache[key] = dtf;\n }\n return dtf;\n}\n\nlet intlNumCache = {};\nfunction getCachendINF(locString, opts = {}) {\n const key = JSON.stringify([locString, opts]);\n let inf = intlNumCache[key];\n if (!inf) {\n inf = new Intl.NumberFormat(locString, opts);\n intlNumCache[key] = inf;\n }\n return inf;\n}\n\nlet intlRelCache = {};\nfunction getCachendRTF(locString, opts = {}) {\n const key = JSON.stringify([locString, opts]);\n let inf = intlRelCache[key];\n if (!inf) {\n inf = new Intl.RelativeTimeFormat(locString, opts);\n intlRelCache[key] = inf;\n }\n return inf;\n}\n\nlet sysLocaleCache = null;\nfunction systemLocale() {\n if (sysLocaleCache) {\n return sysLocaleCache;\n } else if (hasIntl()) {\n const computedSys = new Intl.DateTimeFormat().resolvedOptions().locale;\n // node sometimes defaults to \"und\". Override that because that is dumb\n sysLocaleCache = !computedSys || computedSys === \"und\" ? \"en-US\" : computedSys;\n return sysLocaleCache;\n } else {\n sysLocaleCache = \"en-US\";\n return sysLocaleCache;\n }\n}\n\nfunction parseLocaleString(localeStr) {\n // I really want to avoid writing a BCP 47 parser\n // see, e.g. https://github.com/wooorm/bcp-47\n // Instead, we'll do this:\n\n // a) if the string has no -u extensions, just leave it alone\n // b) if it does, use Intl to resolve everything\n // c) if Intl fails, try again without the -u\n\n const uIndex = localeStr.indexOf(\"-u-\");\n if (uIndex === -1) {\n return [localeStr];\n } else {\n let options;\n const smaller = localeStr.substring(0, uIndex);\n try {\n options = getCachedDTF(localeStr).resolvedOptions();\n } catch (e) {\n options = getCachedDTF(smaller).resolvedOptions();\n }\n\n const { numberingSystem, calendar } = options;\n // return the smaller one so that we can append the calendar and numbering overrides to it\n return [smaller, numberingSystem, calendar];\n }\n}\n\nfunction intlConfigString(localeStr, numberingSystem, outputCalendar) {\n if (hasIntl()) {\n if (outputCalendar || numberingSystem) {\n localeStr += \"-u\";\n\n if (outputCalendar) {\n localeStr += `-ca-${outputCalendar}`;\n }\n\n if (numberingSystem) {\n localeStr += `-nu-${numberingSystem}`;\n }\n return localeStr;\n } else {\n return localeStr;\n }\n } else {\n return [];\n }\n}\n\nfunction mapMonths(f) {\n const ms = [];\n for (let i = 1; i <= 12; i++) {\n const dt = DateTime.utc(2016, i, 1);\n ms.push(f(dt));\n }\n return ms;\n}\n\nfunction mapWeekdays(f) {\n const ms = [];\n for (let i = 1; i <= 7; i++) {\n const dt = DateTime.utc(2016, 11, 13 + i);\n ms.push(f(dt));\n }\n return ms;\n}\n\nfunction listStuff(loc, length, defaultOK, englishFn, intlFn) {\n const mode = loc.listingMode(defaultOK);\n\n if (mode === \"error\") {\n return null;\n } else if (mode === \"en\") {\n return englishFn(length);\n } else {\n return intlFn(length);\n }\n}\n\nfunction supportsFastNumbers(loc) {\n if (loc.numberingSystem && loc.numberingSystem !== \"latn\") {\n return false;\n } else {\n return (\n loc.numberingSystem === \"latn\" ||\n !loc.locale ||\n loc.locale.startsWith(\"en\") ||\n (hasIntl() && new Intl.DateTimeFormat(loc.intl).resolvedOptions().numberingSystem === \"latn\")\n );\n }\n}\n\n/**\n * @private\n */\n\nclass PolyNumberFormatter {\n constructor(intl, forceSimple, opts) {\n this.padTo = opts.padTo || 0;\n this.floor = opts.floor || false;\n\n if (!forceSimple && hasIntl()) {\n const intlOpts = { useGrouping: false };\n if (opts.padTo > 0) intlOpts.minimumIntegerDigits = opts.padTo;\n this.inf = getCachendINF(intl, intlOpts);\n }\n }\n\n format(i) {\n if (this.inf) {\n const fixed = this.floor ? Math.floor(i) : i;\n return this.inf.format(fixed);\n } else {\n // to match the browser's numberformatter defaults\n const fixed = this.floor ? Math.floor(i) : roundTo(i, 3);\n return padStart(fixed, this.padTo);\n }\n }\n}\n\n/**\n * @private\n */\n\nclass PolyDateFormatter {\n constructor(dt, intl, opts) {\n this.opts = opts;\n this.hasIntl = hasIntl();\n\n let z;\n if (dt.zone.universal && this.hasIntl) {\n // Chromium doesn't support fixed-offset zones like Etc/GMT+8 in its formatter,\n // See https://bugs.chromium.org/p/chromium/issues/detail?id=364374.\n // So we have to make do. Two cases:\n // 1. The format options tell us to show the zone. We can't do that, so the best\n // we can do is format the date in UTC.\n // 2. The format options don't tell us to show the zone. Then we can adjust them\n // the time and tell the formatter to show it to us in UTC, so that the time is right\n // and the bad zone doesn't show up.\n // We can clean all this up when Chrome fixes this.\n z = \"UTC\";\n if (opts.timeZoneName) {\n this.dt = dt;\n } else {\n this.dt = dt.offset === 0 ? dt : DateTime.fromMillis(dt.ts + dt.offset * 60 * 1000);\n }\n } else if (dt.zone.type === \"local\") {\n this.dt = dt;\n } else {\n this.dt = dt;\n z = dt.zone.name;\n }\n\n if (this.hasIntl) {\n const intlOpts = Object.assign({}, this.opts);\n if (z) {\n intlOpts.timeZone = z;\n }\n this.dtf = getCachedDTF(intl, intlOpts);\n }\n }\n\n format() {\n if (this.hasIntl) {\n return this.dtf.format(this.dt.toJSDate());\n } else {\n const tokenFormat = English.formatString(this.opts),\n loc = Locale.create(\"en-US\");\n return Formatter.create(loc).formatDateTimeFromString(this.dt, tokenFormat);\n }\n }\n\n formatToParts() {\n if (this.hasIntl && hasFormatToParts()) {\n return this.dtf.formatToParts(this.dt.toJSDate());\n } else {\n // This is kind of a cop out. We actually could do this for English. However, we couldn't do it for intl strings\n // and IMO it's too weird to have an uncanny valley like that\n return [];\n }\n }\n\n resolvedOptions() {\n if (this.hasIntl) {\n return this.dtf.resolvedOptions();\n } else {\n return {\n locale: \"en-US\",\n numberingSystem: \"latn\",\n outputCalendar: \"gregory\"\n };\n }\n }\n}\n\n/**\n * @private\n */\nclass PolyRelFormatter {\n constructor(intl, isEnglish, opts) {\n this.opts = Object.assign({ style: \"long\" }, opts);\n if (!isEnglish && hasRelative()) {\n this.rtf = getCachendRTF(intl, opts);\n }\n }\n\n format(count, unit) {\n if (this.rtf) {\n return this.rtf.format(count, unit);\n } else {\n return English.formatRelativeTime(unit, count, this.opts.numeric, this.opts.style !== \"long\");\n }\n }\n\n formatToParts(count, unit) {\n if (this.rtf) {\n return this.rtf.formatToParts(count, unit);\n } else {\n return [];\n }\n }\n}\n\n/**\n * @private\n */\n\nexport default class Locale {\n static fromOpts(opts) {\n return Locale.create(opts.locale, opts.numberingSystem, opts.outputCalendar, opts.defaultToEN);\n }\n\n static create(locale, numberingSystem, outputCalendar, defaultToEN = false) {\n const specifiedLocale = locale || Settings.defaultLocale,\n // the system locale is useful for human readable strings but annoying for parsing/formatting known formats\n localeR = specifiedLocale || (defaultToEN ? \"en-US\" : systemLocale()),\n numberingSystemR = numberingSystem || Settings.defaultNumberingSystem,\n outputCalendarR = outputCalendar || Settings.defaultOutputCalendar;\n return new Locale(localeR, numberingSystemR, outputCalendarR, specifiedLocale);\n }\n\n static resetCache() {\n sysLocaleCache = null;\n intlDTCache = {};\n intlNumCache = {};\n intlRelCache = {};\n }\n\n static fromObject({ locale, numberingSystem, outputCalendar } = {}) {\n return Locale.create(locale, numberingSystem, outputCalendar);\n }\n\n constructor(locale, numbering, outputCalendar, specifiedLocale) {\n const [parsedLocale, parsedNumberingSystem, parsedOutputCalendar] = parseLocaleString(locale);\n\n this.locale = parsedLocale;\n this.numberingSystem = numbering || parsedNumberingSystem || null;\n this.outputCalendar = outputCalendar || parsedOutputCalendar || null;\n this.intl = intlConfigString(this.locale, this.numberingSystem, this.outputCalendar);\n\n this.weekdaysCache = { format: {}, standalone: {} };\n this.monthsCache = { format: {}, standalone: {} };\n this.meridiemCache = null;\n this.eraCache = {};\n\n this.specifiedLocale = specifiedLocale;\n this.fastNumbersCached = null;\n }\n\n get fastNumbers() {\n if (this.fastNumbersCached == null) {\n this.fastNumbersCached = supportsFastNumbers(this);\n }\n\n return this.fastNumbersCached;\n }\n\n listingMode(defaultOK = true) {\n const intl = hasIntl(),\n hasFTP = intl && hasFormatToParts(),\n isActuallyEn = this.isEnglish(),\n hasNoWeirdness =\n (this.numberingSystem === null || this.numberingSystem === \"latn\") &&\n (this.outputCalendar === null || this.outputCalendar === \"gregory\");\n\n if (!hasFTP && !(isActuallyEn && hasNoWeirdness) && !defaultOK) {\n return \"error\";\n } else if (!hasFTP || (isActuallyEn && hasNoWeirdness)) {\n return \"en\";\n } else {\n return \"intl\";\n }\n }\n\n clone(alts) {\n if (!alts || Object.getOwnPropertyNames(alts).length === 0) {\n return this;\n } else {\n return Locale.create(\n alts.locale || this.specifiedLocale,\n alts.numberingSystem || this.numberingSystem,\n alts.outputCalendar || this.outputCalendar,\n alts.defaultToEN || false\n );\n }\n }\n\n redefaultToEN(alts = {}) {\n return this.clone(Object.assign({}, alts, { defaultToEN: true }));\n }\n\n redefaultToSystem(alts = {}) {\n return this.clone(Object.assign({}, alts, { defaultToEN: false }));\n }\n\n months(length, format = false, defaultOK = true) {\n return listStuff(this, length, defaultOK, English.months, () => {\n const intl = format ? { month: length, day: \"numeric\" } : { month: length },\n formatStr = format ? \"format\" : \"standalone\";\n if (!this.monthsCache[formatStr][length]) {\n this.monthsCache[formatStr][length] = mapMonths(dt => this.extract(dt, intl, \"month\"));\n }\n return this.monthsCache[formatStr][length];\n });\n }\n\n weekdays(length, format = false, defaultOK = true) {\n return listStuff(this, length, defaultOK, English.weekdays, () => {\n const intl = format\n ? { weekday: length, year: \"numeric\", month: \"long\", day: \"numeric\" }\n : { weekday: length },\n formatStr = format ? \"format\" : \"standalone\";\n if (!this.weekdaysCache[formatStr][length]) {\n this.weekdaysCache[formatStr][length] = mapWeekdays(dt =>\n this.extract(dt, intl, \"weekday\")\n );\n }\n return this.weekdaysCache[formatStr][length];\n });\n }\n\n meridiems(defaultOK = true) {\n return listStuff(\n this,\n undefined,\n defaultOK,\n () => English.meridiems,\n () => {\n // In theory there could be aribitrary day periods. We're gonna assume there are exactly two\n // for AM and PM. This is probably wrong, but it's makes parsing way easier.\n if (!this.meridiemCache) {\n const intl = { hour: \"numeric\", hour12: true };\n this.meridiemCache = [DateTime.utc(2016, 11, 13, 9), DateTime.utc(2016, 11, 13, 19)].map(\n dt => this.extract(dt, intl, \"dayperiod\")\n );\n }\n\n return this.meridiemCache;\n }\n );\n }\n\n eras(length, defaultOK = true) {\n return listStuff(this, length, defaultOK, English.eras, () => {\n const intl = { era: length };\n\n // This is utter bullshit. Different calendars are going to define eras totally differently. What I need is the minimum set of dates\n // to definitely enumerate them.\n if (!this.eraCache[length]) {\n this.eraCache[length] = [DateTime.utc(-40, 1, 1), DateTime.utc(2017, 1, 1)].map(dt =>\n this.extract(dt, intl, \"era\")\n );\n }\n\n return this.eraCache[length];\n });\n }\n\n extract(dt, intlOpts, field) {\n const df = this.dtFormatter(dt, intlOpts),\n results = df.formatToParts(),\n matching = results.find(m => m.type.toLowerCase() === field);\n return matching ? matching.value : null;\n }\n\n numberFormatter(opts = {}) {\n // this forcesimple option is never used (the only caller short-circuits on it, but it seems safer to leave)\n // (in contrast, the rest of the condition is used heavily)\n return new PolyNumberFormatter(this.intl, opts.forceSimple || this.fastNumbers, opts);\n }\n\n dtFormatter(dt, intlOpts = {}) {\n return new PolyDateFormatter(dt, this.intl, intlOpts);\n }\n\n relFormatter(opts = {}) {\n return new PolyRelFormatter(this.intl, this.isEnglish(), opts);\n }\n\n isEnglish() {\n return (\n this.locale === \"en\" ||\n this.locale.toLowerCase() === \"en-us\" ||\n (hasIntl() && new Intl.DateTimeFormat(this.intl).resolvedOptions().locale.startsWith(\"en-us\"))\n );\n }\n\n equals(other) {\n return (\n this.locale === other.locale &&\n this.numberingSystem === other.numberingSystem &&\n this.outputCalendar === other.outputCalendar\n );\n }\n}\n","import {\n untruncateYear,\n signedOffset,\n parseInteger,\n parseMillis,\n ianaRegex,\n isUndefined\n} from \"./util.js\";\nimport * as English from \"./english.js\";\nimport FixedOffsetZone from \"../zones/fixedOffsetZone.js\";\nimport IANAZone from \"../zones/IANAZone.js\";\n\n/*\n * This file handles parsing for well-specified formats. Here's how it works:\n * Two things go into parsing: a regex to match with and an extractor to take apart the groups in the match.\n * An extractor is just a function that takes a regex match array and returns a { year: ..., month: ... } object\n * parse() does the work of executing the regex and applying the extractor. It takes multiple regex/extractor pairs to try in sequence.\n * Extractors can take a \"cursor\" representing the offset in the match to look at. This makes it easy to combine extractors.\n * combineExtractors() does the work of combining them, keeping track of the cursor through multiple extractions.\n * Some extractions are super dumb and simpleParse and fromStrings help DRY them.\n */\n\nfunction combineRegexes(...regexes) {\n const full = regexes.reduce((f, r) => f + r.source, \"\");\n return RegExp(`^${full}$`);\n}\n\nfunction combineExtractors(...extractors) {\n return m =>\n extractors\n .reduce(\n ([mergedVals, mergedZone, cursor], ex) => {\n const [val, zone, next] = ex(m, cursor);\n return [Object.assign(mergedVals, val), mergedZone || zone, next];\n },\n [{}, null, 1]\n )\n .slice(0, 2);\n}\n\nfunction parse(s, ...patterns) {\n if (s == null) {\n return [null, null];\n }\n\n for (const [regex, extractor] of patterns) {\n const m = regex.exec(s);\n if (m) {\n return extractor(m);\n }\n }\n return [null, null];\n}\n\nfunction simpleParse(...keys) {\n return (match, cursor) => {\n const ret = {};\n let i;\n\n for (i = 0; i < keys.length; i++) {\n ret[keys[i]] = parseInteger(match[cursor + i]);\n }\n return [ret, null, cursor + i];\n };\n}\n\n// ISO and SQL parsing\nconst offsetRegex = /(?:(Z)|([+-]\\d\\d)(?::?(\\d\\d))?)/,\n isoTimeBaseRegex = /(\\d\\d)(?::?(\\d\\d)(?::?(\\d\\d)(?:[.,](\\d{1,9}))?)?)?/,\n isoTimeRegex = RegExp(`${isoTimeBaseRegex.source}${offsetRegex.source}?`),\n isoTimeExtensionRegex = RegExp(`(?:T${isoTimeRegex.source})?`),\n isoYmdRegex = /([+-]\\d{6}|\\d{4})(?:-?(\\d\\d)(?:-?(\\d\\d))?)?/,\n isoWeekRegex = /(\\d{4})-?W(\\d\\d)(?:-?(\\d))?/,\n isoOrdinalRegex = /(\\d{4})-?(\\d{3})/,\n extractISOWeekData = simpleParse(\"weekYear\", \"weekNumber\", \"weekDay\"),\n extractISOOrdinalData = simpleParse(\"year\", \"ordinal\"),\n sqlYmdRegex = /(\\d{4})-(\\d\\d)-(\\d\\d)/, // dumbed-down version of the ISO one\n sqlTimeRegex = RegExp(\n `${isoTimeBaseRegex.source} ?(?:${offsetRegex.source}|(${ianaRegex.source}))?`\n ),\n sqlTimeExtensionRegex = RegExp(`(?: ${sqlTimeRegex.source})?`);\n\nfunction int(match, pos, fallback) {\n const m = match[pos];\n return isUndefined(m) ? fallback : parseInteger(m);\n}\n\nfunction extractISOYmd(match, cursor) {\n const item = {\n year: int(match, cursor),\n month: int(match, cursor + 1, 1),\n day: int(match, cursor + 2, 1)\n };\n\n return [item, null, cursor + 3];\n}\n\nfunction extractISOTime(match, cursor) {\n const item = {\n hour: int(match, cursor, 0),\n minute: int(match, cursor + 1, 0),\n second: int(match, cursor + 2, 0),\n millisecond: parseMillis(match[cursor + 3])\n };\n\n return [item, null, cursor + 4];\n}\n\nfunction extractISOOffset(match, cursor) {\n const local = !match[cursor] && !match[cursor + 1],\n fullOffset = signedOffset(match[cursor + 1], match[cursor + 2]),\n zone = local ? null : FixedOffsetZone.instance(fullOffset);\n return [{}, zone, cursor + 3];\n}\n\nfunction extractIANAZone(match, cursor) {\n const zone = match[cursor] ? IANAZone.create(match[cursor]) : null;\n return [{}, zone, cursor + 1];\n}\n\n// ISO duration parsing\n\nconst isoDuration = /^P(?:(?:(-?\\d{1,9})Y)?(?:(-?\\d{1,9})M)?(?:(-?\\d{1,9})W)?(?:(-?\\d{1,9})D)?(?:T(?:(-?\\d{1,9})H)?(?:(-?\\d{1,9})M)?(?:(-?\\d{1,9})(?:[.,](-?\\d{1,9}))?S)?)?)$/;\n\nfunction extractISODuration(match) {\n const [\n ,\n yearStr,\n monthStr,\n weekStr,\n dayStr,\n hourStr,\n minuteStr,\n secondStr,\n millisecondsStr\n ] = match;\n\n return [\n {\n years: parseInteger(yearStr),\n months: parseInteger(monthStr),\n weeks: parseInteger(weekStr),\n days: parseInteger(dayStr),\n hours: parseInteger(hourStr),\n minutes: parseInteger(minuteStr),\n seconds: parseInteger(secondStr),\n milliseconds: parseMillis(millisecondsStr)\n }\n ];\n}\n\n// These are a little braindead. EDT *should* tell us that we're in, say, America/New_York\n// and not just that we're in -240 *right now*. But since I don't think these are used that often\n// I'm just going to ignore that\nconst obsOffsets = {\n GMT: 0,\n EDT: -4 * 60,\n EST: -5 * 60,\n CDT: -5 * 60,\n CST: -6 * 60,\n MDT: -6 * 60,\n MST: -7 * 60,\n PDT: -7 * 60,\n PST: -8 * 60\n};\n\nfunction fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {\n const result = {\n year: yearStr.length === 2 ? untruncateYear(parseInteger(yearStr)) : parseInteger(yearStr),\n month: English.monthsShort.indexOf(monthStr) + 1,\n day: parseInteger(dayStr),\n hour: parseInteger(hourStr),\n minute: parseInteger(minuteStr)\n };\n\n if (secondStr) result.second = parseInteger(secondStr);\n if (weekdayStr) {\n result.weekday =\n weekdayStr.length > 3\n ? English.weekdaysLong.indexOf(weekdayStr) + 1\n : English.weekdaysShort.indexOf(weekdayStr) + 1;\n }\n\n return result;\n}\n\n// RFC 2822/5322\nconst rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s)?(\\d{1,2})\\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s(\\d{2,4})\\s(\\d\\d):(\\d\\d)(?::(\\d\\d))?\\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|(?:([+-]\\d\\d)(\\d\\d)))$/;\n\nfunction extractRFC2822(match) {\n const [\n ,\n weekdayStr,\n dayStr,\n monthStr,\n yearStr,\n hourStr,\n minuteStr,\n secondStr,\n obsOffset,\n milOffset,\n offHourStr,\n offMinuteStr\n ] = match,\n result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);\n\n let offset;\n if (obsOffset) {\n offset = obsOffsets[obsOffset];\n } else if (milOffset) {\n offset = 0;\n } else {\n offset = signedOffset(offHourStr, offMinuteStr);\n }\n\n return [result, new FixedOffsetZone(offset)];\n}\n\nfunction preprocessRFC2822(s) {\n // Remove comments and folding whitespace and replace multiple-spaces with a single space\n return s\n .replace(/\\([^)]*\\)|[\\n\\t]/g, \" \")\n .replace(/(\\s\\s+)/g, \" \")\n .trim();\n}\n\n// http date\n\nconst rfc1123 = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun), (\\d\\d) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\\d{4}) (\\d\\d):(\\d\\d):(\\d\\d) GMT$/,\n rfc850 = /^(Monday|Tuesday|Wedsday|Thursday|Friday|Saturday|Sunday), (\\d\\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\\d\\d) (\\d\\d):(\\d\\d):(\\d\\d) GMT$/,\n ascii = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ( \\d|\\d\\d) (\\d\\d):(\\d\\d):(\\d\\d) (\\d{4})$/;\n\nfunction extractRFC1123Or850(match) {\n const [, weekdayStr, dayStr, monthStr, yearStr, hourStr, minuteStr, secondStr] = match,\n result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);\n return [result, FixedOffsetZone.utcInstance];\n}\n\nfunction extractASCII(match) {\n const [, weekdayStr, monthStr, dayStr, hourStr, minuteStr, secondStr, yearStr] = match,\n result = fromStrings(weekdayStr, yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr);\n return [result, FixedOffsetZone.utcInstance];\n}\n\nconst isoYmdWithTimeExtensionRegex = combineRegexes(isoYmdRegex, isoTimeExtensionRegex);\nconst isoWeekWithTimeExtensionRegex = combineRegexes(isoWeekRegex, isoTimeExtensionRegex);\nconst isoOrdinalWithTimeExtensionRegex = combineRegexes(isoOrdinalRegex, isoTimeExtensionRegex);\nconst isoTimeCombinedRegex = combineRegexes(isoTimeRegex);\n\nconst extractISOYmdTimeAndOffset = combineExtractors(\n extractISOYmd,\n extractISOTime,\n extractISOOffset\n);\nconst extractISOWeekTimeAndOffset = combineExtractors(\n extractISOWeekData,\n extractISOTime,\n extractISOOffset\n);\nconst extractISOOrdinalDataAndTime = combineExtractors(extractISOOrdinalData, extractISOTime);\nconst extractISOTimeAndOffset = combineExtractors(extractISOTime, extractISOOffset);\n\n/**\n * @private\n */\n\nexport function parseISODate(s) {\n return parse(\n s,\n [isoYmdWithTimeExtensionRegex, extractISOYmdTimeAndOffset],\n [isoWeekWithTimeExtensionRegex, extractISOWeekTimeAndOffset],\n [isoOrdinalWithTimeExtensionRegex, extractISOOrdinalDataAndTime],\n [isoTimeCombinedRegex, extractISOTimeAndOffset]\n );\n}\n\nexport function parseRFC2822Date(s) {\n return parse(preprocessRFC2822(s), [rfc2822, extractRFC2822]);\n}\n\nexport function parseHTTPDate(s) {\n return parse(\n s,\n [rfc1123, extractRFC1123Or850],\n [rfc850, extractRFC1123Or850],\n [ascii, extractASCII]\n );\n}\n\nexport function parseISODuration(s) {\n return parse(s, [isoDuration, extractISODuration]);\n}\n\nconst sqlYmdWithTimeExtensionRegex = combineRegexes(sqlYmdRegex, sqlTimeExtensionRegex);\nconst sqlTimeCombinedRegex = combineRegexes(sqlTimeRegex);\n\nconst extractISOYmdTimeOffsetAndIANAZone = combineExtractors(\n extractISOYmd,\n extractISOTime,\n extractISOOffset,\n extractIANAZone\n);\nconst extractISOTimeOffsetAndIANAZone = combineExtractors(\n extractISOTime,\n extractISOOffset,\n extractIANAZone\n);\n\nexport function parseSQL(s) {\n return parse(\n s,\n [sqlYmdWithTimeExtensionRegex, extractISOYmdTimeOffsetAndIANAZone],\n [sqlTimeCombinedRegex, extractISOTimeOffsetAndIANAZone]\n );\n}\n","export default class Invalid {\n constructor(reason, explanation) {\n this.reason = reason;\n this.explanation = explanation;\n }\n\n toMessage() {\n if (this.explanation) {\n return `${this.reason}: ${this.explanation}`;\n } else {\n return this.reason;\n }\n }\n}\n","import { isUndefined, isNumber, normalizeObject, hasOwnProperty } from \"./impl/util.js\";\nimport Locale from \"./impl/locale.js\";\nimport Formatter from \"./impl/formatter.js\";\nimport { parseISODuration } from \"./impl/regexParser.js\";\nimport Settings from \"./settings.js\";\nimport { InvalidArgumentError, InvalidDurationError, InvalidUnitError } from \"./errors.js\";\nimport Invalid from \"./impl/invalid.js\";\n\nconst INVALID = \"Invalid Duration\";\n\n// unit conversion constants\nconst lowOrderMatrix = {\n weeks: {\n days: 7,\n hours: 7 * 24,\n minutes: 7 * 24 * 60,\n seconds: 7 * 24 * 60 * 60,\n milliseconds: 7 * 24 * 60 * 60 * 1000\n },\n days: {\n hours: 24,\n minutes: 24 * 60,\n seconds: 24 * 60 * 60,\n milliseconds: 24 * 60 * 60 * 1000\n },\n hours: { minutes: 60, seconds: 60 * 60, milliseconds: 60 * 60 * 1000 },\n minutes: { seconds: 60, milliseconds: 60 * 1000 },\n seconds: { milliseconds: 1000 }\n },\n casualMatrix = Object.assign(\n {\n years: {\n months: 12,\n weeks: 52,\n days: 365,\n hours: 365 * 24,\n minutes: 365 * 24 * 60,\n seconds: 365 * 24 * 60 * 60,\n milliseconds: 365 * 24 * 60 * 60 * 1000\n },\n quarters: {\n months: 3,\n weeks: 13,\n days: 91,\n hours: 91 * 24,\n minutes: 91 * 24 * 60,\n milliseconds: 91 * 24 * 60 * 60 * 1000\n },\n months: {\n weeks: 4,\n days: 30,\n hours: 30 * 24,\n minutes: 30 * 24 * 60,\n seconds: 30 * 24 * 60 * 60,\n milliseconds: 30 * 24 * 60 * 60 * 1000\n }\n },\n lowOrderMatrix\n ),\n daysInYearAccurate = 146097.0 / 400,\n daysInMonthAccurate = 146097.0 / 4800,\n accurateMatrix = Object.assign(\n {\n years: {\n months: 12,\n weeks: daysInYearAccurate / 7,\n days: daysInYearAccurate,\n hours: daysInYearAccurate * 24,\n minutes: daysInYearAccurate * 24 * 60,\n seconds: daysInYearAccurate * 24 * 60 * 60,\n milliseconds: daysInYearAccurate * 24 * 60 * 60 * 1000\n },\n quarters: {\n months: 3,\n weeks: daysInYearAccurate / 28,\n days: daysInYearAccurate / 4,\n hours: (daysInYearAccurate * 24) / 4,\n minutes: (daysInYearAccurate * 24 * 60) / 4,\n seconds: (daysInYearAccurate * 24 * 60 * 60) / 4,\n milliseconds: (daysInYearAccurate * 24 * 60 * 60 * 1000) / 4\n },\n months: {\n weeks: daysInMonthAccurate / 7,\n days: daysInMonthAccurate,\n hours: daysInMonthAccurate * 24,\n minutes: daysInMonthAccurate * 24 * 60,\n seconds: daysInMonthAccurate * 24 * 60 * 60,\n milliseconds: daysInMonthAccurate * 24 * 60 * 60 * 1000\n }\n },\n lowOrderMatrix\n );\n\n// units ordered by size\nconst orderedUnits = [\n \"years\",\n \"quarters\",\n \"months\",\n \"weeks\",\n \"days\",\n \"hours\",\n \"minutes\",\n \"seconds\",\n \"milliseconds\"\n];\n\nconst reverseUnits = orderedUnits.slice(0).reverse();\n\n// clone really means \"create another instance just like this one, but with these changes\"\nfunction clone(dur, alts, clear = false) {\n // deep merge for vals\n const conf = {\n values: clear ? alts.values : Object.assign({}, dur.values, alts.values || {}),\n loc: dur.loc.clone(alts.loc),\n conversionAccuracy: alts.conversionAccuracy || dur.conversionAccuracy\n };\n return new Duration(conf);\n}\n\nfunction antiTrunc(n) {\n return n < 0 ? Math.floor(n) : Math.ceil(n);\n}\n\n// NB: mutates parameters\nfunction convert(matrix, fromMap, fromUnit, toMap, toUnit) {\n const conv = matrix[toUnit][fromUnit],\n raw = fromMap[fromUnit] / conv,\n sameSign = Math.sign(raw) === Math.sign(toMap[toUnit]),\n // ok, so this is wild, but see the matrix in the tests\n added =\n !sameSign && toMap[toUnit] !== 0 && Math.abs(raw) <= 1 ? antiTrunc(raw) : Math.trunc(raw);\n toMap[toUnit] += added;\n fromMap[fromUnit] -= added * conv;\n}\n\n// NB: mutates parameters\nfunction normalizeValues(matrix, vals) {\n reverseUnits.reduce((previous, current) => {\n if (!isUndefined(vals[current])) {\n if (previous) {\n convert(matrix, vals, previous, vals, current);\n }\n return current;\n } else {\n return previous;\n }\n }, null);\n}\n\n/**\n * A Duration object represents a period of time, like \"2 months\" or \"1 day, 1 hour\". Conceptually, it's just a map of units to their quantities, accompanied by some additional configuration and methods for creating, parsing, interrogating, transforming, and formatting them. They can be used on their own or in conjunction with other Luxon types; for example, you can use {@link DateTime.plus} to add a Duration object to a DateTime, producing another DateTime.\n *\n * Here is a brief overview of commonly used methods and getters in Duration:\n *\n * * **Creation** To create a Duration, use {@link Duration.fromMillis}, {@link Duration.fromObject}, or {@link Duration.fromISO}.\n * * **Unit values** See the {@link Duration.years}, {@link Duration.months}, {@link Duration.weeks}, {@link Duration.days}, {@link Duration.hours}, {@link Duration.minutes}, {@link Duration.seconds}, {@link Duration.milliseconds} accessors.\n * * **Configuration** See {@link Duration.locale} and {@link Duration.numberingSystem} accessors.\n * * **Transformation** To create new Durations out of old ones use {@link Duration.plus}, {@link Duration.minus}, {@link Duration.normalize}, {@link Duration.set}, {@link Duration.reconfigure}, {@link Duration.shiftTo}, and {@link Duration.negate}.\n * * **Output** To convert the Duration into other representations, see {@link Duration.as}, {@link Duration.toISO}, {@link Duration.toFormat}, and {@link Duration.toJSON}\n *\n * There's are more methods documented below. In addition, for more information on subtler topics like internationalization and validity, see the external documentation.\n */\nexport default class Duration {\n /**\n * @private\n */\n constructor(config) {\n const accurate = config.conversionAccuracy === \"longterm\" || false;\n /**\n * @access private\n */\n this.values = config.values;\n /**\n * @access private\n */\n this.loc = config.loc || Locale.create();\n /**\n * @access private\n */\n this.conversionAccuracy = accurate ? \"longterm\" : \"casual\";\n /**\n * @access private\n */\n this.invalid = config.invalid || null;\n /**\n * @access private\n */\n this.matrix = accurate ? accurateMatrix : casualMatrix;\n /**\n * @access private\n */\n this.isLuxonDuration = true;\n }\n\n /**\n * Create Duration from a number of milliseconds.\n * @param {number} count of milliseconds\n * @param {Object} opts - options for parsing\n * @param {string} [opts.locale='en-US'] - the locale to use\n * @param {string} opts.numberingSystem - the numbering system to use\n * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use\n * @return {Duration}\n */\n static fromMillis(count, opts) {\n return Duration.fromObject(Object.assign({ milliseconds: count }, opts));\n }\n\n /**\n * Create a Duration from a Javascript object with keys like 'years' and 'hours.\n * If this object is empty then a zero milliseconds duration is returned.\n * @param {Object} obj - the object to create the DateTime from\n * @param {number} obj.years\n * @param {number} obj.quarters\n * @param {number} obj.months\n * @param {number} obj.weeks\n * @param {number} obj.days\n * @param {number} obj.hours\n * @param {number} obj.minutes\n * @param {number} obj.seconds\n * @param {number} obj.milliseconds\n * @param {string} [obj.locale='en-US'] - the locale to use\n * @param {string} obj.numberingSystem - the numbering system to use\n * @param {string} [obj.conversionAccuracy='casual'] - the conversion system to use\n * @return {Duration}\n */\n static fromObject(obj) {\n if (obj == null || typeof obj !== \"object\") {\n throw new InvalidArgumentError(\n `Duration.fromObject: argument expected to be an object, got ${\n obj === null ? \"null\" : typeof obj\n }`\n );\n }\n return new Duration({\n values: normalizeObject(obj, Duration.normalizeUnit, [\n \"locale\",\n \"numberingSystem\",\n \"conversionAccuracy\",\n \"zone\" // a bit of debt; it's super inconvenient internally not to be able to blindly pass this\n ]),\n loc: Locale.fromObject(obj),\n conversionAccuracy: obj.conversionAccuracy\n });\n }\n\n /**\n * Create a Duration from an ISO 8601 duration string.\n * @param {string} text - text to parse\n * @param {Object} opts - options for parsing\n * @param {string} [opts.locale='en-US'] - the locale to use\n * @param {string} opts.numberingSystem - the numbering system to use\n * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use\n * @see https://en.wikipedia.org/wiki/ISO_8601#Durations\n * @example Duration.fromISO('P3Y6M1W4DT12H30M5S').toObject() //=> { years: 3, months: 6, weeks: 1, days: 4, hours: 12, minutes: 30, seconds: 5 }\n * @example Duration.fromISO('PT23H').toObject() //=> { hours: 23 }\n * @example Duration.fromISO('P5Y3M').toObject() //=> { years: 5, months: 3 }\n * @return {Duration}\n */\n static fromISO(text, opts) {\n const [parsed] = parseISODuration(text);\n if (parsed) {\n const obj = Object.assign(parsed, opts);\n return Duration.fromObject(obj);\n } else {\n return Duration.invalid(\"unparsable\", `the input \"${text}\" can't be parsed as ISO 8601`);\n }\n }\n\n /**\n * Create an invalid Duration.\n * @param {string} reason - simple string of why this datetime is invalid. Should not contain parameters or anything else data-dependent\n * @param {string} [explanation=null] - longer explanation, may include parameters and other useful debugging information\n * @return {Duration}\n */\n static invalid(reason, explanation = null) {\n if (!reason) {\n throw new InvalidArgumentError(\"need to specify a reason the Duration is invalid\");\n }\n\n const invalid = reason instanceof Invalid ? reason : new Invalid(reason, explanation);\n\n if (Settings.throwOnInvalid) {\n throw new InvalidDurationError(invalid);\n } else {\n return new Duration({ invalid });\n }\n }\n\n /**\n * @private\n */\n static normalizeUnit(unit) {\n const normalized = {\n year: \"years\",\n years: \"years\",\n quarter: \"quarters\",\n quarters: \"quarters\",\n month: \"months\",\n months: \"months\",\n week: \"weeks\",\n weeks: \"weeks\",\n day: \"days\",\n days: \"days\",\n hour: \"hours\",\n hours: \"hours\",\n minute: \"minutes\",\n minutes: \"minutes\",\n second: \"seconds\",\n seconds: \"seconds\",\n millisecond: \"milliseconds\",\n milliseconds: \"milliseconds\"\n }[unit ? unit.toLowerCase() : unit];\n\n if (!normalized) throw new InvalidUnitError(unit);\n\n return normalized;\n }\n\n /**\n * Check if an object is a Duration. Works across context boundaries\n * @param {object} o\n * @return {boolean}\n */\n static isDuration(o) {\n return (o && o.isLuxonDuration) || false;\n }\n\n /**\n * Get the locale of a Duration, such 'en-GB'\n * @type {string}\n */\n get locale() {\n return this.isValid ? this.loc.locale : null;\n }\n\n /**\n * Get the numbering system of a Duration, such 'beng'. The numbering system is used when formatting the Duration\n *\n * @type {string}\n */\n get numberingSystem() {\n return this.isValid ? this.loc.numberingSystem : null;\n }\n\n /**\n * Returns a string representation of this Duration formatted according to the specified format string. You may use these tokens:\n * * `S` for milliseconds\n * * `s` for seconds\n * * `m` for minutes\n * * `h` for hours\n * * `d` for days\n * * `M` for months\n * * `y` for years\n * Notes:\n * * Add padding by repeating the token, e.g. \"yy\" pads the years to two digits, \"hhhh\" pads the hours out to four digits\n * * The duration will be converted to the set of units in the format string using {@link Duration.shiftTo} and the Durations's conversion accuracy setting.\n * @param {string} fmt - the format string\n * @param {Object} opts - options\n * @param {boolean} [opts.floor=true] - floor numerical values\n * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toFormat(\"y d s\") //=> \"1 6 2\"\n * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toFormat(\"yy dd sss\") //=> \"01 06 002\"\n * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toFormat(\"M S\") //=> \"12 518402000\"\n * @return {string}\n */\n toFormat(fmt, opts = {}) {\n // reverse-compat since 1.2; we always round down now, never up, and we do it by default\n const fmtOpts = Object.assign({}, opts, {\n floor: opts.round !== false && opts.floor !== false\n });\n return this.isValid\n ? Formatter.create(this.loc, fmtOpts).formatDurationFromString(this, fmt)\n : INVALID;\n }\n\n /**\n * Returns a Javascript object with this Duration's values.\n * @param opts - options for generating the object\n * @param {boolean} [opts.includeConfig=false] - include configuration attributes in the output\n * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toObject() //=> { years: 1, days: 6, seconds: 2 }\n * @return {Object}\n */\n toObject(opts = {}) {\n if (!this.isValid) return {};\n\n const base = Object.assign({}, this.values);\n\n if (opts.includeConfig) {\n base.conversionAccuracy = this.conversionAccuracy;\n base.numberingSystem = this.loc.numberingSystem;\n base.locale = this.loc.locale;\n }\n return base;\n }\n\n /**\n * Returns an ISO 8601-compliant string representation of this Duration.\n * @see https://en.wikipedia.org/wiki/ISO_8601#Durations\n * @example Duration.fromObject({ years: 3, seconds: 45 }).toISO() //=> 'P3YT45S'\n * @example Duration.fromObject({ months: 4, seconds: 45 }).toISO() //=> 'P4MT45S'\n * @example Duration.fromObject({ months: 5 }).toISO() //=> 'P5M'\n * @example Duration.fromObject({ minutes: 5 }).toISO() //=> 'PT5M'\n * @example Duration.fromObject({ milliseconds: 6 }).toISO() //=> 'PT0.006S'\n * @return {string}\n */\n toISO() {\n // we could use the formatter, but this is an easier way to get the minimum string\n if (!this.isValid) return null;\n\n let s = \"P\";\n if (this.years !== 0) s += this.years + \"Y\";\n if (this.months !== 0 || this.quarters !== 0) s += this.months + this.quarters * 3 + \"M\";\n if (this.weeks !== 0) s += this.weeks + \"W\";\n if (this.days !== 0) s += this.days + \"D\";\n if (this.hours !== 0 || this.minutes !== 0 || this.seconds !== 0 || this.milliseconds !== 0)\n s += \"T\";\n if (this.hours !== 0) s += this.hours + \"H\";\n if (this.minutes !== 0) s += this.minutes + \"M\";\n if (this.seconds !== 0 || this.milliseconds !== 0)\n s += this.seconds + this.milliseconds / 1000 + \"S\";\n if (s === \"P\") s += \"T0S\";\n return s;\n }\n\n /**\n * Returns an ISO 8601 representation of this Duration appropriate for use in JSON.\n * @return {string}\n */\n toJSON() {\n return this.toISO();\n }\n\n /**\n * Returns an ISO 8601 representation of this Duration appropriate for use in debugging.\n * @return {string}\n */\n toString() {\n return this.toISO();\n }\n\n /**\n * Returns an milliseconds value of this Duration.\n * @return {number}\n */\n valueOf() {\n return this.as(\"milliseconds\");\n }\n\n /**\n * Make this Duration longer by the specified amount. Return a newly-constructed Duration.\n * @param {Duration|Object|number} duration - The amount to add. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject()\n * @return {Duration}\n */\n plus(duration) {\n if (!this.isValid) return this;\n\n const dur = friendlyDuration(duration),\n result = {};\n\n for (const k of orderedUnits) {\n if (hasOwnProperty(dur.values, k) || hasOwnProperty(this.values, k)) {\n result[k] = dur.get(k) + this.get(k);\n }\n }\n\n return clone(this, { values: result }, true);\n }\n\n /**\n * Make this Duration shorter by the specified amount. Return a newly-constructed Duration.\n * @param {Duration|Object|number} duration - The amount to subtract. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject()\n * @return {Duration}\n */\n minus(duration) {\n if (!this.isValid) return this;\n\n const dur = friendlyDuration(duration);\n return this.plus(dur.negate());\n }\n\n /**\n * Get the value of unit.\n * @param {string} unit - a unit such as 'minute' or 'day'\n * @example Duration.fromObject({years: 2, days: 3}).years //=> 2\n * @example Duration.fromObject({years: 2, days: 3}).months //=> 0\n * @example Duration.fromObject({years: 2, days: 3}).days //=> 3\n * @return {number}\n */\n get(unit) {\n return this[Duration.normalizeUnit(unit)];\n }\n\n /**\n * \"Set\" the values of specified units. Return a newly-constructed Duration.\n * @param {Object} values - a mapping of units to numbers\n * @example dur.set({ years: 2017 })\n * @example dur.set({ hours: 8, minutes: 30 })\n * @return {Duration}\n */\n set(values) {\n if (!this.isValid) return this;\n\n const mixed = Object.assign(this.values, normalizeObject(values, Duration.normalizeUnit, []));\n return clone(this, { values: mixed });\n }\n\n /**\n * \"Set\" the locale and/or numberingSystem. Returns a newly-constructed Duration.\n * @example dur.reconfigure({ locale: 'en-GB' })\n * @return {Duration}\n */\n reconfigure({ locale, numberingSystem, conversionAccuracy } = {}) {\n const loc = this.loc.clone({ locale, numberingSystem }),\n opts = { loc };\n\n if (conversionAccuracy) {\n opts.conversionAccuracy = conversionAccuracy;\n }\n\n return clone(this, opts);\n }\n\n /**\n * Return the length of the duration in the specified unit.\n * @param {string} unit - a unit such as 'minutes' or 'days'\n * @example Duration.fromObject({years: 1}).as('days') //=> 365\n * @example Duration.fromObject({years: 1}).as('months') //=> 12\n * @example Duration.fromObject({hours: 60}).as('days') //=> 2.5\n * @return {number}\n */\n as(unit) {\n return this.isValid ? this.shiftTo(unit).get(unit) : NaN;\n }\n\n /**\n * Reduce this Duration to its canonical representation in its current units.\n * @example Duration.fromObject({ years: 2, days: 5000 }).normalize().toObject() //=> { years: 15, days: 255 }\n * @example Duration.fromObject({ hours: 12, minutes: -45 }).normalize().toObject() //=> { hours: 11, minutes: 15 }\n * @return {Duration}\n */\n normalize() {\n if (!this.isValid) return this;\n const vals = this.toObject();\n normalizeValues(this.matrix, vals);\n return clone(this, { values: vals }, true);\n }\n\n /**\n * Convert this Duration into its representation in a different set of units.\n * @example Duration.fromObject({ hours: 1, seconds: 30 }).shiftTo('minutes', 'milliseconds').toObject() //=> { minutes: 60, milliseconds: 30000 }\n * @return {Duration}\n */\n shiftTo(...units) {\n if (!this.isValid) return this;\n\n if (units.length === 0) {\n return this;\n }\n\n units = units.map(u => Duration.normalizeUnit(u));\n\n const built = {},\n accumulated = {},\n vals = this.toObject();\n let lastUnit;\n\n normalizeValues(this.matrix, vals);\n\n for (const k of orderedUnits) {\n if (units.indexOf(k) >= 0) {\n lastUnit = k;\n\n let own = 0;\n\n // anything we haven't boiled down yet should get boiled to this unit\n for (const ak in accumulated) {\n own += this.matrix[ak][k] * accumulated[ak];\n accumulated[ak] = 0;\n }\n\n // plus anything that's already in this unit\n if (isNumber(vals[k])) {\n own += vals[k];\n }\n\n const i = Math.trunc(own);\n built[k] = i;\n accumulated[k] = own - i; // we'd like to absorb these fractions in another unit\n\n // plus anything further down the chain that should be rolled up in to this\n for (const down in vals) {\n if (orderedUnits.indexOf(down) > orderedUnits.indexOf(k)) {\n convert(this.matrix, vals, down, built, k);\n }\n }\n // otherwise, keep it in the wings to boil it later\n } else if (isNumber(vals[k])) {\n accumulated[k] = vals[k];\n }\n }\n\n // anything leftover becomes the decimal for the last unit\n // lastUnit must be defined since units is not empty\n for (const key in accumulated) {\n if (accumulated[key] !== 0) {\n built[lastUnit] +=\n key === lastUnit ? accumulated[key] : accumulated[key] / this.matrix[lastUnit][key];\n }\n }\n\n return clone(this, { values: built }, true).normalize();\n }\n\n /**\n * Return the negative of this Duration.\n * @example Duration.fromObject({ hours: 1, seconds: 30 }).negate().toObject() //=> { hours: -1, seconds: -30 }\n * @return {Duration}\n */\n negate() {\n if (!this.isValid) return this;\n const negated = {};\n for (const k of Object.keys(this.values)) {\n negated[k] = -this.values[k];\n }\n return clone(this, { values: negated }, true);\n }\n\n /**\n * Get the years.\n * @type {number}\n */\n get years() {\n return this.isValid ? this.values.years || 0 : NaN;\n }\n\n /**\n * Get the quarters.\n * @type {number}\n */\n get quarters() {\n return this.isValid ? this.values.quarters || 0 : NaN;\n }\n\n /**\n * Get the months.\n * @type {number}\n */\n get months() {\n return this.isValid ? this.values.months || 0 : NaN;\n }\n\n /**\n * Get the weeks\n * @type {number}\n */\n get weeks() {\n return this.isValid ? this.values.weeks || 0 : NaN;\n }\n\n /**\n * Get the days.\n * @type {number}\n */\n get days() {\n return this.isValid ? this.values.days || 0 : NaN;\n }\n\n /**\n * Get the hours.\n * @type {number}\n */\n get hours() {\n return this.isValid ? this.values.hours || 0 : NaN;\n }\n\n /**\n * Get the minutes.\n * @type {number}\n */\n get minutes() {\n return this.isValid ? this.values.minutes || 0 : NaN;\n }\n\n /**\n * Get the seconds.\n * @return {number}\n */\n get seconds() {\n return this.isValid ? this.values.seconds || 0 : NaN;\n }\n\n /**\n * Get the milliseconds.\n * @return {number}\n */\n get milliseconds() {\n return this.isValid ? this.values.milliseconds || 0 : NaN;\n }\n\n /**\n * Returns whether the Duration is invalid. Invalid durations are returned by diff operations\n * on invalid DateTimes or Intervals.\n * @return {boolean}\n */\n get isValid() {\n return this.invalid === null;\n }\n\n /**\n * Returns an error code if this Duration became invalid, or null if the Duration is valid\n * @return {string}\n */\n get invalidReason() {\n return this.invalid ? this.invalid.reason : null;\n }\n\n /**\n * Returns an explanation of why this Duration became invalid, or null if the Duration is valid\n * @type {string}\n */\n get invalidExplanation() {\n return this.invalid ? this.invalid.explanation : null;\n }\n\n /**\n * Equality check\n * Two Durations are equal iff they have the same units and the same values for each unit.\n * @param {Duration} other\n * @return {boolean}\n */\n equals(other) {\n if (!this.isValid || !other.isValid) {\n return false;\n }\n\n if (!this.loc.equals(other.loc)) {\n return false;\n }\n\n for (const u of orderedUnits) {\n if (this.values[u] !== other.values[u]) {\n return false;\n }\n }\n return true;\n }\n}\n\n/**\n * @private\n */\nexport function friendlyDuration(durationish) {\n if (isNumber(durationish)) {\n return Duration.fromMillis(durationish);\n } else if (Duration.isDuration(durationish)) {\n return durationish;\n } else if (typeof durationish === \"object\") {\n return Duration.fromObject(durationish);\n } else {\n throw new InvalidArgumentError(\n `Unknown duration argument ${durationish} of type ${typeof durationish}`\n );\n }\n}\n","import DateTime, { friendlyDateTime } from \"./datetime.js\";\nimport Duration, { friendlyDuration } from \"./duration.js\";\nimport Settings from \"./settings.js\";\nimport { InvalidArgumentError, InvalidIntervalError } from \"./errors.js\";\nimport Invalid from \"./impl/invalid.js\";\n\nconst INVALID = \"Invalid Interval\";\n\n// checks if the start is equal to or before the end\nfunction validateStartEnd(start, end) {\n if (!start || !start.isValid) {\n return Interval.invalid(\"missing or invalid start\");\n } else if (!end || !end.isValid) {\n return Interval.invalid(\"missing or invalid end\");\n } else if (end < start) {\n return Interval.invalid(\n \"end before start\",\n `The end of an interval must be after its start, but you had start=${start.toISO()} and end=${end.toISO()}`\n );\n } else {\n return null;\n }\n}\n\n/**\n * An Interval object represents a half-open interval of time, where each endpoint is a {@link DateTime}. Conceptually, it's a container for those two endpoints, accompanied by methods for creating, parsing, interrogating, comparing, transforming, and formatting them.\n *\n * Here is a brief overview of the most commonly used methods and getters in Interval:\n *\n * * **Creation** To create an Interval, use {@link fromDateTimes}, {@link after}, {@link before}, or {@link fromISO}.\n * * **Accessors** Use {@link start} and {@link end} to get the start and end.\n * * **Interrogation** To analyze the Interval, use {@link count}, {@link length}, {@link hasSame}, {@link contains}, {@link isAfter}, or {@link isBefore}.\n * * **Transformation** To create other Intervals out of this one, use {@link set}, {@link splitAt}, {@link splitBy}, {@link divideEqually}, {@link merge}, {@link xor}, {@link union}, {@link intersection}, or {@link difference}.\n * * **Comparison** To compare this Interval to another one, use {@link equals}, {@link overlaps}, {@link abutsStart}, {@link abutsEnd}, {@link engulfs}\n * * **Output*** To convert the Interval into other representations, see {@link toString}, {@link toISO}, {@link toFormat}, and {@link toDuration}.\n */\nexport default class Interval {\n /**\n * @private\n */\n constructor(config) {\n /**\n * @access private\n */\n this.s = config.start;\n /**\n * @access private\n */\n this.e = config.end;\n /**\n * @access private\n */\n this.invalid = config.invalid || null;\n /**\n * @access private\n */\n this.isLuxonInterval = true;\n }\n\n /**\n * Create an invalid Interval.\n * @param {string} reason - simple string of why this Interval is invalid. Should not contain parameters or anything else data-dependent\n * @param {string} [explanation=null] - longer explanation, may include parameters and other useful debugging information\n * @return {Interval}\n */\n static invalid(reason, explanation = null) {\n if (!reason) {\n throw new InvalidArgumentError(\"need to specify a reason the Interval is invalid\");\n }\n\n const invalid = reason instanceof Invalid ? reason : new Invalid(reason, explanation);\n\n if (Settings.throwOnInvalid) {\n throw new InvalidIntervalError(invalid);\n } else {\n return new Interval({ invalid });\n }\n }\n\n /**\n * Create an Interval from a start DateTime and an end DateTime. Inclusive of the start but not the end.\n * @param {DateTime|Date|Object} start\n * @param {DateTime|Date|Object} end\n * @return {Interval}\n */\n static fromDateTimes(start, end) {\n const builtStart = friendlyDateTime(start),\n builtEnd = friendlyDateTime(end);\n\n const validateError = validateStartEnd(builtStart, builtEnd);\n\n if (validateError == null) {\n return new Interval({\n start: builtStart,\n end: builtEnd\n });\n } else {\n return validateError;\n }\n }\n\n /**\n * Create an Interval from a start DateTime and a Duration to extend to.\n * @param {DateTime|Date|Object} start\n * @param {Duration|Object|number} duration - the length of the Interval.\n * @return {Interval}\n */\n static after(start, duration) {\n const dur = friendlyDuration(duration),\n dt = friendlyDateTime(start);\n return Interval.fromDateTimes(dt, dt.plus(dur));\n }\n\n /**\n * Create an Interval from an end DateTime and a Duration to extend backwards to.\n * @param {DateTime|Date|Object} end\n * @param {Duration|Object|number} duration - the length of the Interval.\n * @return {Interval}\n */\n static before(end, duration) {\n const dur = friendlyDuration(duration),\n dt = friendlyDateTime(end);\n return Interval.fromDateTimes(dt.minus(dur), dt);\n }\n\n /**\n * Create an Interval from an ISO 8601 string.\n * Accepts `/`, `/`, and `/` formats.\n * @param {string} text - the ISO string to parse\n * @param {Object} [opts] - options to pass {@link DateTime.fromISO} and optionally {@link Duration.fromISO}\n * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals\n * @return {Interval}\n */\n static fromISO(text, opts) {\n const [s, e] = (text || \"\").split(\"/\", 2);\n if (s && e) {\n const start = DateTime.fromISO(s, opts),\n end = DateTime.fromISO(e, opts);\n\n if (start.isValid && end.isValid) {\n return Interval.fromDateTimes(start, end);\n }\n\n if (start.isValid) {\n const dur = Duration.fromISO(e, opts);\n if (dur.isValid) {\n return Interval.after(start, dur);\n }\n } else if (end.isValid) {\n const dur = Duration.fromISO(s, opts);\n if (dur.isValid) {\n return Interval.before(end, dur);\n }\n }\n }\n return Interval.invalid(\"unparsable\", `the input \"${text}\" can't be parsed asISO 8601`);\n }\n\n /**\n * Check if an object is an Interval. Works across context boundaries\n * @param {object} o\n * @return {boolean}\n */\n static isInterval(o) {\n return (o && o.isLuxonInterval) || false;\n }\n\n /**\n * Returns the start of the Interval\n * @type {DateTime}\n */\n get start() {\n return this.isValid ? this.s : null;\n }\n\n /**\n * Returns the end of the Interval\n * @type {DateTime}\n */\n get end() {\n return this.isValid ? this.e : null;\n }\n\n /**\n * Returns whether this Interval's end is at least its start, i.e. that the Interval isn't 'backwards'.\n * @type {boolean}\n */\n get isValid() {\n return this.invalidReason === null;\n }\n\n /**\n * Returns an error code if this Interval is invalid, or null if the Interval is valid\n * @type {string}\n */\n get invalidReason() {\n return this.invalid ? this.invalid.reason : null;\n }\n\n /**\n * Returns an explanation of why this Interval became invalid, or null if the Interval is valid\n * @type {string}\n */\n get invalidExplanation() {\n return this.invalid ? this.invalid.explanation : null;\n }\n\n /**\n * Returns the length of the Interval in the specified unit.\n * @param {string} unit - the unit (such as 'hours' or 'days') to return the length in.\n * @return {number}\n */\n length(unit = \"milliseconds\") {\n return this.isValid ? this.toDuration(...[unit]).get(unit) : NaN;\n }\n\n /**\n * Returns the count of minutes, hours, days, months, or years included in the Interval, even in part.\n * Unlike {@link length} this counts sections of the calendar, not periods of time, e.g. specifying 'day'\n * asks 'what dates are included in this interval?', not 'how many days long is this interval?'\n * @param {string} [unit='milliseconds'] - the unit of time to count.\n * @return {number}\n */\n count(unit = \"milliseconds\") {\n if (!this.isValid) return NaN;\n const start = this.start.startOf(unit),\n end = this.end.startOf(unit);\n return Math.floor(end.diff(start, unit).get(unit)) + 1;\n }\n\n /**\n * Returns whether this Interval's start and end are both in the same unit of time\n * @param {string} unit - the unit of time to check sameness on\n * @return {boolean}\n */\n hasSame(unit) {\n return this.isValid ? this.e.minus(1).hasSame(this.s, unit) : false;\n }\n\n /**\n * Return whether this Interval has the same start and end DateTimes.\n * @return {boolean}\n */\n isEmpty() {\n return this.s.valueOf() === this.e.valueOf();\n }\n\n /**\n * Return whether this Interval's start is after the specified DateTime.\n * @param {DateTime} dateTime\n * @return {boolean}\n */\n isAfter(dateTime) {\n if (!this.isValid) return false;\n return this.s > dateTime;\n }\n\n /**\n * Return whether this Interval's end is before the specified DateTime.\n * @param {DateTime} dateTime\n * @return {boolean}\n */\n isBefore(dateTime) {\n if (!this.isValid) return false;\n return this.e <= dateTime;\n }\n\n /**\n * Return whether this Interval contains the specified DateTime.\n * @param {DateTime} dateTime\n * @return {boolean}\n */\n contains(dateTime) {\n if (!this.isValid) return false;\n return this.s <= dateTime && this.e > dateTime;\n }\n\n /**\n * \"Sets\" the start and/or end dates. Returns a newly-constructed Interval.\n * @param {Object} values - the values to set\n * @param {DateTime} values.start - the starting DateTime\n * @param {DateTime} values.end - the ending DateTime\n * @return {Interval}\n */\n set({ start, end } = {}) {\n if (!this.isValid) return this;\n return Interval.fromDateTimes(start || this.s, end || this.e);\n }\n\n /**\n * Split this Interval at each of the specified DateTimes\n * @param {...[DateTime]} dateTimes - the unit of time to count.\n * @return {[Interval]}\n */\n splitAt(...dateTimes) {\n if (!this.isValid) return [];\n const sorted = dateTimes\n .map(friendlyDateTime)\n .filter(d => this.contains(d))\n .sort(),\n results = [];\n let { s } = this,\n i = 0;\n\n while (s < this.e) {\n const added = sorted[i] || this.e,\n next = +added > +this.e ? this.e : added;\n results.push(Interval.fromDateTimes(s, next));\n s = next;\n i += 1;\n }\n\n return results;\n }\n\n /**\n * Split this Interval into smaller Intervals, each of the specified length.\n * Left over time is grouped into a smaller interval\n * @param {Duration|Object|number} duration - The length of each resulting interval.\n * @return {[Interval]}\n */\n splitBy(duration) {\n const dur = friendlyDuration(duration);\n\n if (!this.isValid || !dur.isValid || dur.as(\"milliseconds\") === 0) {\n return [];\n }\n\n let { s } = this,\n added,\n next;\n\n const results = [];\n while (s < this.e) {\n added = s.plus(dur);\n next = +added > +this.e ? this.e : added;\n results.push(Interval.fromDateTimes(s, next));\n s = next;\n }\n\n return results;\n }\n\n /**\n * Split this Interval into the specified number of smaller intervals.\n * @param {number} numberOfParts - The number of Intervals to divide the Interval into.\n * @return {[Interval]}\n */\n divideEqually(numberOfParts) {\n if (!this.isValid) return [];\n return this.splitBy(this.length() / numberOfParts).slice(0, numberOfParts);\n }\n\n /**\n * Return whether this Interval overlaps with the specified Interval\n * @param {Interval} other\n * @return {boolean}\n */\n overlaps(other) {\n return this.e > other.s && this.s < other.e;\n }\n\n /**\n * Return whether this Interval's end is adjacent to the specified Interval's start.\n * @param {Interval} other\n * @return {boolean}\n */\n abutsStart(other) {\n if (!this.isValid) return false;\n return +this.e === +other.s;\n }\n\n /**\n * Return whether this Interval's start is adjacent to the specified Interval's end.\n * @param {Interval} other\n * @return {boolean}\n */\n abutsEnd(other) {\n if (!this.isValid) return false;\n return +other.e === +this.s;\n }\n\n /**\n * Return whether this Interval engulfs the start and end of the specified Interval.\n * @param {Interval} other\n * @return {boolean}\n */\n engulfs(other) {\n if (!this.isValid) return false;\n return this.s <= other.s && this.e >= other.e;\n }\n\n /**\n * Return whether this Interval has the same start and end as the specified Interval.\n * @param {Interval} other\n * @return {boolean}\n */\n equals(other) {\n if (!this.isValid || !other.isValid) {\n return false;\n }\n\n return this.s.equals(other.s) && this.e.equals(other.e);\n }\n\n /**\n * Return an Interval representing the intersection of this Interval and the specified Interval.\n * Specifically, the resulting Interval has the maximum start time and the minimum end time of the two Intervals.\n * Returns null if the intersection is empty, i.e., the intervals don't intersect.\n * @param {Interval} other\n * @return {Interval}\n */\n intersection(other) {\n if (!this.isValid) return this;\n const s = this.s > other.s ? this.s : other.s,\n e = this.e < other.e ? this.e : other.e;\n\n if (s > e) {\n return null;\n } else {\n return Interval.fromDateTimes(s, e);\n }\n }\n\n /**\n * Return an Interval representing the union of this Interval and the specified Interval.\n * Specifically, the resulting Interval has the minimum start time and the maximum end time of the two Intervals.\n * @param {Interval} other\n * @return {Interval}\n */\n union(other) {\n if (!this.isValid) return this;\n const s = this.s < other.s ? this.s : other.s,\n e = this.e > other.e ? this.e : other.e;\n return Interval.fromDateTimes(s, e);\n }\n\n /**\n * Merge an array of Intervals into a equivalent minimal set of Intervals.\n * Combines overlapping and adjacent Intervals.\n * @param {[Interval]} intervals\n * @return {[Interval]}\n */\n static merge(intervals) {\n const [found, final] = intervals.sort((a, b) => a.s - b.s).reduce(\n ([sofar, current], item) => {\n if (!current) {\n return [sofar, item];\n } else if (current.overlaps(item) || current.abutsStart(item)) {\n return [sofar, current.union(item)];\n } else {\n return [sofar.concat([current]), item];\n }\n },\n [[], null]\n );\n if (final) {\n found.push(final);\n }\n return found;\n }\n\n /**\n * Return an array of Intervals representing the spans of time that only appear in one of the specified Intervals.\n * @param {[Interval]} intervals\n * @return {[Interval]}\n */\n static xor(intervals) {\n let start = null,\n currentCount = 0;\n const results = [],\n ends = intervals.map(i => [{ time: i.s, type: \"s\" }, { time: i.e, type: \"e\" }]),\n flattened = Array.prototype.concat(...ends),\n arr = flattened.sort((a, b) => a.time - b.time);\n\n for (const i of arr) {\n currentCount += i.type === \"s\" ? 1 : -1;\n\n if (currentCount === 1) {\n start = i.time;\n } else {\n if (start && +start !== +i.time) {\n results.push(Interval.fromDateTimes(start, i.time));\n }\n\n start = null;\n }\n }\n\n return Interval.merge(results);\n }\n\n /**\n * Return an Interval representing the span of time in this Interval that doesn't overlap with any of the specified Intervals.\n * @param {...Interval} intervals\n * @return {[Interval]}\n */\n difference(...intervals) {\n return Interval.xor([this].concat(intervals))\n .map(i => this.intersection(i))\n .filter(i => i && !i.isEmpty());\n }\n\n /**\n * Returns a string representation of this Interval appropriate for debugging.\n * @return {string}\n */\n toString() {\n if (!this.isValid) return INVALID;\n return `[${this.s.toISO()} – ${this.e.toISO()})`;\n }\n\n /**\n * Returns an ISO 8601-compliant string representation of this Interval.\n * @see https://en.wikipedia.org/wiki/ISO_8601#Time_intervals\n * @param {Object} opts - The same options as {@link DateTime.toISO}\n * @return {string}\n */\n toISO(opts) {\n if (!this.isValid) return INVALID;\n return `${this.s.toISO(opts)}/${this.e.toISO(opts)}`;\n }\n\n /**\n * Returns a string representation of this Interval formatted according to the specified format string.\n * @param {string} dateFormat - the format string. This string formats the start and end time. See {@link DateTime.toFormat} for details.\n * @param {Object} opts - options\n * @param {string} [opts.separator = ' – '] - a separator to place between the start and end representations\n * @return {string}\n */\n toFormat(dateFormat, { separator = \" – \" } = {}) {\n if (!this.isValid) return INVALID;\n return `${this.s.toFormat(dateFormat)}${separator}${this.e.toFormat(dateFormat)}`;\n }\n\n /**\n * Return a Duration representing the time spanned by this interval.\n * @param {string|string[]} [unit=['milliseconds']] - the unit or units (such as 'hours' or 'days') to include in the duration.\n * @param {Object} opts - options that affect the creation of the Duration\n * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use\n * @example Interval.fromDateTimes(dt1, dt2).toDuration().toObject() //=> { milliseconds: 88489257 }\n * @example Interval.fromDateTimes(dt1, dt2).toDuration('days').toObject() //=> { days: 1.0241812152777778 }\n * @example Interval.fromDateTimes(dt1, dt2).toDuration(['hours', 'minutes']).toObject() //=> { hours: 24, minutes: 34.82095 }\n * @example Interval.fromDateTimes(dt1, dt2).toDuration(['hours', 'minutes', 'seconds']).toObject() //=> { hours: 24, minutes: 34, seconds: 49.257 }\n * @example Interval.fromDateTimes(dt1, dt2).toDuration('seconds').toObject() //=> { seconds: 88489.257 }\n * @return {Duration}\n */\n toDuration(unit, opts) {\n if (!this.isValid) {\n return Duration.invalid(this.invalidReason);\n }\n return this.e.diff(this.s, unit, opts);\n }\n\n /**\n * Run mapFn on the interval start and end, returning a new Interval from the resulting DateTimes\n * @param {function} mapFn\n * @return {Interval}\n * @example Interval.fromDateTimes(dt1, dt2).mapEndpoints(endpoint => endpoint.toUTC())\n * @example Interval.fromDateTimes(dt1, dt2).mapEndpoints(endpoint => endpoint.plus({ hours: 2 }))\n */\n mapEndpoints(mapFn) {\n return Interval.fromDateTimes(mapFn(this.s), mapFn(this.e));\n }\n}\n","import DateTime from \"./datetime.js\";\nimport Settings from \"./settings.js\";\nimport Locale from \"./impl/locale.js\";\nimport IANAZone from \"./zones/IANAZone.js\";\nimport { normalizeZone } from \"./impl/zoneUtil.js\";\n\nimport { hasFormatToParts, hasIntl, hasRelative } from \"./impl/util.js\";\n\n/**\n * The Info class contains static methods for retrieving general time and date related data. For example, it has methods for finding out if a time zone has a DST, for listing the months in any supported locale, and for discovering which of Luxon features are available in the current environment.\n */\nexport default class Info {\n /**\n * Return whether the specified zone contains a DST.\n * @param {string|Zone} [zone='local'] - Zone to check. Defaults to the environment's local zone.\n * @return {boolean}\n */\n static hasDST(zone = Settings.defaultZone) {\n const proto = DateTime.local()\n .setZone(zone)\n .set({ month: 12 });\n\n return !zone.universal && proto.offset !== proto.set({ month: 6 }).offset;\n }\n\n /**\n * Return whether the specified zone is a valid IANA specifier.\n * @param {string} zone - Zone to check\n * @return {boolean}\n */\n static isValidIANAZone(zone) {\n return IANAZone.isValidSpecifier(zone) && IANAZone.isValidZone(zone);\n }\n\n /**\n * Converts the input into a {@link Zone} instance.\n *\n * * If `input` is already a Zone instance, it is returned unchanged.\n * * If `input` is a string containing a valid time zone name, a Zone instance\n * with that name is returned.\n * * If `input` is a string that doesn't refer to a known time zone, a Zone\n * instance with {@link Zone.isValid} == false is returned.\n * * If `input is a number, a Zone instance with the specified fixed offset\n * in minutes is returned.\n * * If `input` is `null` or `undefined`, the default zone is returned.\n * @param {string|Zone|number} [input] - the value to be converted\n * @return {Zone}\n */\n static normalizeZone(input) {\n return normalizeZone(input, Settings.defaultZone);\n }\n\n /**\n * Return an array of standalone month names.\n * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat\n * @param {string} [length='long'] - the length of the month representation, such as \"numeric\", \"2-digit\", \"narrow\", \"short\", \"long\"\n * @param {Object} opts - options\n * @param {string} [opts.locale] - the locale code\n * @param {string} [opts.numberingSystem=null] - the numbering system\n * @param {string} [opts.outputCalendar='gregory'] - the calendar\n * @example Info.months()[0] //=> 'January'\n * @example Info.months('short')[0] //=> 'Jan'\n * @example Info.months('numeric')[0] //=> '1'\n * @example Info.months('short', { locale: 'fr-CA' } )[0] //=> 'janv.'\n * @example Info.months('numeric', { locale: 'ar' })[0] //=> '١'\n * @example Info.months('long', { outputCalendar: 'islamic' })[0] //=> 'Rabiʻ I'\n * @return {[string]}\n */\n static months(\n length = \"long\",\n { locale = null, numberingSystem = null, outputCalendar = \"gregory\" } = {}\n ) {\n return Locale.create(locale, numberingSystem, outputCalendar).months(length);\n }\n\n /**\n * Return an array of format month names.\n * Format months differ from standalone months in that they're meant to appear next to the day of the month. In some languages, that\n * changes the string.\n * See {@link months}\n * @param {string} [length='long'] - the length of the month representation, such as \"numeric\", \"2-digit\", \"narrow\", \"short\", \"long\"\n * @param {Object} opts - options\n * @param {string} [opts.locale] - the locale code\n * @param {string} [opts.numberingSystem=null] - the numbering system\n * @param {string} [opts.outputCalendar='gregory'] - the calendar\n * @return {[string]}\n */\n static monthsFormat(\n length = \"long\",\n { locale = null, numberingSystem = null, outputCalendar = \"gregory\" } = {}\n ) {\n return Locale.create(locale, numberingSystem, outputCalendar).months(length, true);\n }\n\n /**\n * Return an array of standalone week names.\n * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat\n * @param {string} [length='long'] - the length of the month representation, such as \"narrow\", \"short\", \"long\".\n * @param {Object} opts - options\n * @param {string} [opts.locale] - the locale code\n * @param {string} [opts.numberingSystem=null] - the numbering system\n * @example Info.weekdays()[0] //=> 'Monday'\n * @example Info.weekdays('short')[0] //=> 'Mon'\n * @example Info.weekdays('short', { locale: 'fr-CA' })[0] //=> 'lun.'\n * @example Info.weekdays('short', { locale: 'ar' })[0] //=> 'الاثنين'\n * @return {[string]}\n */\n static weekdays(length = \"long\", { locale = null, numberingSystem = null } = {}) {\n return Locale.create(locale, numberingSystem, null).weekdays(length);\n }\n\n /**\n * Return an array of format week names.\n * Format weekdays differ from standalone weekdays in that they're meant to appear next to more date information. In some languages, that\n * changes the string.\n * See {@link weekdays}\n * @param {string} [length='long'] - the length of the month representation, such as \"narrow\", \"short\", \"long\".\n * @param {Object} opts - options\n * @param {string} [opts.locale=null] - the locale code\n * @param {string} [opts.numberingSystem=null] - the numbering system\n * @return {[string]}\n */\n static weekdaysFormat(length = \"long\", { locale = null, numberingSystem = null } = {}) {\n return Locale.create(locale, numberingSystem, null).weekdays(length, true);\n }\n\n /**\n * Return an array of meridiems.\n * @param {Object} opts - options\n * @param {string} [opts.locale] - the locale code\n * @example Info.meridiems() //=> [ 'AM', 'PM' ]\n * @example Info.meridiems({ locale: 'my' }) //=> [ 'နံနက်', 'ညနေ' ]\n * @return {[string]}\n */\n static meridiems({ locale = null } = {}) {\n return Locale.create(locale).meridiems();\n }\n\n /**\n * Return an array of eras, such as ['BC', 'AD']. The locale can be specified, but the calendar system is always Gregorian.\n * @param {string} [length='short'] - the length of the era representation, such as \"short\" or \"long\".\n * @param {Object} opts - options\n * @param {string} [opts.locale] - the locale code\n * @example Info.eras() //=> [ 'BC', 'AD' ]\n * @example Info.eras('long') //=> [ 'Before Christ', 'Anno Domini' ]\n * @example Info.eras('long', { locale: 'fr' }) //=> [ 'avant Jésus-Christ', 'après Jésus-Christ' ]\n * @return {[string]}\n */\n static eras(length = \"short\", { locale = null } = {}) {\n return Locale.create(locale, null, \"gregory\").eras(length);\n }\n\n /**\n * Return the set of available features in this environment.\n * Some features of Luxon are not available in all environments. For example, on older browsers, timezone support is not available. Use this function to figure out if that's the case.\n * Keys:\n * * `zones`: whether this environment supports IANA timezones\n * * `intlTokens`: whether this environment supports internationalized token-based formatting/parsing\n * * `intl`: whether this environment supports general internationalization\n * * `relative`: whether this environment supports relative time formatting\n * @example Info.features() //=> { intl: true, intlTokens: false, zones: true, relative: false }\n * @return {Object}\n */\n static features() {\n let intl = false,\n intlTokens = false,\n zones = false,\n relative = false;\n\n if (hasIntl()) {\n intl = true;\n intlTokens = hasFormatToParts();\n relative = hasRelative();\n\n try {\n zones =\n new Intl.DateTimeFormat(\"en\", { timeZone: \"America/New_York\" }).resolvedOptions()\n .timeZone === \"America/New_York\";\n } catch (e) {\n zones = false;\n }\n }\n\n return { intl, intlTokens, zones, relative };\n }\n}\n","import Duration from \"../duration.js\";\n\nfunction dayDiff(earlier, later) {\n const utcDayStart = dt =>\n dt\n .toUTC(0, { keepLocalTime: true })\n .startOf(\"day\")\n .valueOf(),\n ms = utcDayStart(later) - utcDayStart(earlier);\n return Math.floor(Duration.fromMillis(ms).as(\"days\"));\n}\n\nfunction highOrderDiffs(cursor, later, units) {\n const differs = [\n [\"years\", (a, b) => b.year - a.year],\n [\"months\", (a, b) => b.month - a.month + (b.year - a.year) * 12],\n [\n \"weeks\",\n (a, b) => {\n const days = dayDiff(a, b);\n return (days - (days % 7)) / 7;\n }\n ],\n [\"days\", dayDiff]\n ];\n\n const results = {};\n let lowestOrder, highWater;\n\n for (const [unit, differ] of differs) {\n if (units.indexOf(unit) >= 0) {\n lowestOrder = unit;\n\n let delta = differ(cursor, later);\n highWater = cursor.plus({ [unit]: delta });\n\n if (highWater > later) {\n cursor = cursor.plus({ [unit]: delta - 1 });\n delta -= 1;\n } else {\n cursor = highWater;\n }\n\n results[unit] = delta;\n }\n }\n\n return [cursor, results, highWater, lowestOrder];\n}\n\nexport default function(earlier, later, units, opts) {\n let [cursor, results, highWater, lowestOrder] = highOrderDiffs(earlier, later, units);\n\n const remainingMillis = later - cursor;\n\n const lowerOrderUnits = units.filter(\n u => [\"hours\", \"minutes\", \"seconds\", \"milliseconds\"].indexOf(u) >= 0\n );\n\n if (lowerOrderUnits.length === 0) {\n if (highWater < later) {\n highWater = cursor.plus({ [lowestOrder]: 1 });\n }\n\n if (highWater !== cursor) {\n results[lowestOrder] = (results[lowestOrder] || 0) + remainingMillis / (highWater - cursor);\n }\n }\n\n const duration = Duration.fromObject(Object.assign(results, opts));\n\n if (lowerOrderUnits.length > 0) {\n return Duration.fromMillis(remainingMillis, opts)\n .shiftTo(...lowerOrderUnits)\n .plus(duration);\n } else {\n return duration;\n }\n}\n","const numberingSystems = {\n arab: \"[\\u0660-\\u0669]\",\n arabext: \"[\\u06F0-\\u06F9]\",\n bali: \"[\\u1B50-\\u1B59]\",\n beng: \"[\\u09E6-\\u09EF]\",\n deva: \"[\\u0966-\\u096F]\",\n fullwide: \"[\\uFF10-\\uFF19]\",\n gujr: \"[\\u0AE6-\\u0AEF]\",\n hanidec: \"[〇|一|二|三|四|五|六|七|八|九]\",\n khmr: \"[\\u17E0-\\u17E9]\",\n knda: \"[\\u0CE6-\\u0CEF]\",\n laoo: \"[\\u0ED0-\\u0ED9]\",\n limb: \"[\\u1946-\\u194F]\",\n mlym: \"[\\u0D66-\\u0D6F]\",\n mong: \"[\\u1810-\\u1819]\",\n mymr: \"[\\u1040-\\u1049]\",\n orya: \"[\\u0B66-\\u0B6F]\",\n tamldec: \"[\\u0BE6-\\u0BEF]\",\n telu: \"[\\u0C66-\\u0C6F]\",\n thai: \"[\\u0E50-\\u0E59]\",\n tibt: \"[\\u0F20-\\u0F29]\",\n latn: \"\\\\d\"\n};\n\nconst numberingSystemsUTF16 = {\n arab: [1632, 1641],\n arabext: [1776, 1785],\n bali: [6992, 7001],\n beng: [2534, 2543],\n deva: [2406, 2415],\n fullwide: [65296, 65303],\n gujr: [2790, 2799],\n khmr: [6112, 6121],\n knda: [3302, 3311],\n laoo: [3792, 3801],\n limb: [6470, 6479],\n mlym: [3430, 3439],\n mong: [6160, 6169],\n mymr: [4160, 4169],\n orya: [2918, 2927],\n tamldec: [3046, 3055],\n telu: [3174, 3183],\n thai: [3664, 3673],\n tibt: [3872, 3881]\n};\n\n// eslint-disable-next-line\nconst hanidecChars = numberingSystems.hanidec.replace(/[\\[|\\]]/g, \"\").split(\"\");\n\nexport function parseDigits(str) {\n let value = parseInt(str, 10);\n if (isNaN(value)) {\n value = \"\";\n for (let i = 0; i < str.length; i++) {\n const code = str.charCodeAt(i);\n\n if (str[i].search(numberingSystems.hanidec) !== -1) {\n value += hanidecChars.indexOf(str[i]);\n } else {\n for (const key in numberingSystemsUTF16) {\n const [min, max] = numberingSystemsUTF16[key];\n if (code >= min && code <= max) {\n value += code - min;\n }\n }\n }\n }\n return parseInt(value, 10);\n } else {\n return value;\n }\n}\n\nexport function digitRegex({ numberingSystem }, append = \"\") {\n return new RegExp(`${numberingSystems[numberingSystem || \"latn\"]}${append}`);\n}\n","import { parseMillis, isUndefined, untruncateYear, signedOffset, hasOwnProperty } from \"./util.js\";\nimport Formatter from \"./formatter.js\";\nimport FixedOffsetZone from \"../zones/fixedOffsetZone.js\";\nimport IANAZone from \"../zones/IANAZone.js\";\nimport DateTime from \"../datetime.js\";\nimport { digitRegex, parseDigits } from \"./digits.js\";\n\nconst MISSING_FTP = \"missing Intl.DateTimeFormat.formatToParts support\";\n\nfunction intUnit(regex, post = i => i) {\n return { regex, deser: ([s]) => post(parseDigits(s)) };\n}\n\nfunction fixListRegex(s) {\n // make dots optional and also make them literal\n return s.replace(/\\./, \"\\\\.?\");\n}\n\nfunction stripInsensitivities(s) {\n return s.replace(/\\./, \"\").toLowerCase();\n}\n\nfunction oneOf(strings, startIndex) {\n if (strings === null) {\n return null;\n } else {\n return {\n regex: RegExp(strings.map(fixListRegex).join(\"|\")),\n deser: ([s]) =>\n strings.findIndex(i => stripInsensitivities(s) === stripInsensitivities(i)) + startIndex\n };\n }\n}\n\nfunction offset(regex, groups) {\n return { regex, deser: ([, h, m]) => signedOffset(h, m), groups };\n}\n\nfunction simple(regex) {\n return { regex, deser: ([s]) => s };\n}\n\nfunction escapeToken(value) {\n // eslint-disable-next-line no-useless-escape\n return value.replace(/[\\-\\[\\]{}()*+?.,\\\\\\^$|#\\s]/g, \"\\\\$&\");\n}\n\nfunction unitForToken(token, loc) {\n const one = digitRegex(loc),\n two = digitRegex(loc, \"{2}\"),\n three = digitRegex(loc, \"{3}\"),\n four = digitRegex(loc, \"{4}\"),\n six = digitRegex(loc, \"{6}\"),\n oneOrTwo = digitRegex(loc, \"{1,2}\"),\n oneToThree = digitRegex(loc, \"{1,3}\"),\n oneToSix = digitRegex(loc, \"{1,6}\"),\n oneToNine = digitRegex(loc, \"{1,9}\"),\n twoToFour = digitRegex(loc, \"{2,4}\"),\n fourToSix = digitRegex(loc, \"{4,6}\"),\n literal = t => ({ regex: RegExp(escapeToken(t.val)), deser: ([s]) => s, literal: true }),\n unitate = t => {\n if (token.literal) {\n return literal(t);\n }\n switch (t.val) {\n // era\n case \"G\":\n return oneOf(loc.eras(\"short\", false), 0);\n case \"GG\":\n return oneOf(loc.eras(\"long\", false), 0);\n // years\n case \"y\":\n return intUnit(oneToSix);\n case \"yy\":\n return intUnit(twoToFour, untruncateYear);\n case \"yyyy\":\n return intUnit(four);\n case \"yyyyy\":\n return intUnit(fourToSix);\n case \"yyyyyy\":\n return intUnit(six);\n // months\n case \"M\":\n return intUnit(oneOrTwo);\n case \"MM\":\n return intUnit(two);\n case \"MMM\":\n return oneOf(loc.months(\"short\", true, false), 1);\n case \"MMMM\":\n return oneOf(loc.months(\"long\", true, false), 1);\n case \"L\":\n return intUnit(oneOrTwo);\n case \"LL\":\n return intUnit(two);\n case \"LLL\":\n return oneOf(loc.months(\"short\", false, false), 1);\n case \"LLLL\":\n return oneOf(loc.months(\"long\", false, false), 1);\n // dates\n case \"d\":\n return intUnit(oneOrTwo);\n case \"dd\":\n return intUnit(two);\n // ordinals\n case \"o\":\n return intUnit(oneToThree);\n case \"ooo\":\n return intUnit(three);\n // time\n case \"HH\":\n return intUnit(two);\n case \"H\":\n return intUnit(oneOrTwo);\n case \"hh\":\n return intUnit(two);\n case \"h\":\n return intUnit(oneOrTwo);\n case \"mm\":\n return intUnit(two);\n case \"m\":\n return intUnit(oneOrTwo);\n case \"s\":\n return intUnit(oneOrTwo);\n case \"ss\":\n return intUnit(two);\n case \"S\":\n return intUnit(oneToThree);\n case \"SSS\":\n return intUnit(three);\n case \"u\":\n return simple(oneToNine);\n // meridiem\n case \"a\":\n return oneOf(loc.meridiems(), 0);\n // weekYear (k)\n case \"kkkk\":\n return intUnit(four);\n case \"kk\":\n return intUnit(twoToFour, untruncateYear);\n // weekNumber (W)\n case \"W\":\n return intUnit(oneOrTwo);\n case \"WW\":\n return intUnit(two);\n // weekdays\n case \"E\":\n case \"c\":\n return intUnit(one);\n case \"EEE\":\n return oneOf(loc.weekdays(\"short\", false, false), 1);\n case \"EEEE\":\n return oneOf(loc.weekdays(\"long\", false, false), 1);\n case \"ccc\":\n return oneOf(loc.weekdays(\"short\", true, false), 1);\n case \"cccc\":\n return oneOf(loc.weekdays(\"long\", true, false), 1);\n // offset/zone\n case \"Z\":\n case \"ZZ\":\n return offset(new RegExp(`([+-]${oneOrTwo.source})(?::(${two.source}))?`), 2);\n case \"ZZZ\":\n return offset(new RegExp(`([+-]${oneOrTwo.source})(${two.source})?`), 2);\n // we don't support ZZZZ (PST) or ZZZZZ (Pacific Standard Time) in parsing\n // because we don't have any way to figure out what they are\n case \"z\":\n return simple(/[a-z_+-/]{1,256}?/i);\n default:\n return literal(t);\n }\n };\n\n const unit = unitate(token) || {\n invalidReason: MISSING_FTP\n };\n\n unit.token = token;\n\n return unit;\n}\n\nconst partTypeStyleToTokenVal = {\n year: {\n \"2-digit\": \"yy\",\n numeric: \"yyyyy\"\n },\n month: {\n numeric: \"M\",\n \"2-digit\": \"MM\",\n short: \"MMM\",\n long: \"MMMM\"\n },\n day: {\n numeric: \"d\",\n \"2-digit\": \"dd\"\n },\n weekday: {\n short: \"EEE\",\n long: \"EEEE\"\n },\n dayperiod: \"a\",\n hour: {\n numeric: \"h\",\n \"2-digit\": \"hh\"\n },\n minute: {\n numeric: \"m\",\n \"2-digit\": \"mm\"\n },\n second: {\n numeric: \"s\",\n \"2-digit\": \"ss\"\n }\n};\n\nfunction tokenForPart(part, locale, formatOpts) {\n const { type, value } = part;\n\n if (type === \"literal\") {\n return {\n literal: true,\n val: value\n };\n }\n\n const style = formatOpts[type];\n\n let val = partTypeStyleToTokenVal[type];\n if (typeof val === \"object\") {\n val = val[style];\n }\n\n if (val) {\n return {\n literal: false,\n val\n };\n }\n\n return undefined;\n}\n\nfunction buildRegex(units) {\n const re = units.map(u => u.regex).reduce((f, r) => `${f}(${r.source})`, \"\");\n return [`^${re}$`, units];\n}\n\nfunction match(input, regex, handlers) {\n const matches = input.match(regex);\n\n if (matches) {\n const all = {};\n let matchIndex = 1;\n for (const i in handlers) {\n if (hasOwnProperty(handlers, i)) {\n const h = handlers[i],\n groups = h.groups ? h.groups + 1 : 1;\n if (!h.literal && h.token) {\n all[h.token.val[0]] = h.deser(matches.slice(matchIndex, matchIndex + groups));\n }\n matchIndex += groups;\n }\n }\n return [matches, all];\n } else {\n return [matches, {}];\n }\n}\n\nfunction dateTimeFromMatches(matches) {\n const toField = token => {\n switch (token) {\n case \"S\":\n return \"millisecond\";\n case \"s\":\n return \"second\";\n case \"m\":\n return \"minute\";\n case \"h\":\n case \"H\":\n return \"hour\";\n case \"d\":\n return \"day\";\n case \"o\":\n return \"ordinal\";\n case \"L\":\n case \"M\":\n return \"month\";\n case \"y\":\n return \"year\";\n case \"E\":\n case \"c\":\n return \"weekday\";\n case \"W\":\n return \"weekNumber\";\n case \"k\":\n return \"weekYear\";\n default:\n return null;\n }\n };\n\n let zone;\n if (!isUndefined(matches.Z)) {\n zone = new FixedOffsetZone(matches.Z);\n } else if (!isUndefined(matches.z)) {\n zone = IANAZone.create(matches.z);\n } else {\n zone = null;\n }\n\n if (!isUndefined(matches.h)) {\n if (matches.h < 12 && matches.a === 1) {\n matches.h += 12;\n } else if (matches.h === 12 && matches.a === 0) {\n matches.h = 0;\n }\n }\n\n if (matches.G === 0 && matches.y) {\n matches.y = -matches.y;\n }\n\n if (!isUndefined(matches.u)) {\n matches.S = parseMillis(matches.u);\n }\n\n const vals = Object.keys(matches).reduce((r, k) => {\n const f = toField(k);\n if (f) {\n r[f] = matches[k];\n }\n\n return r;\n }, {});\n\n return [vals, zone];\n}\n\nlet dummyDateTimeCache = null;\n\nfunction getDummyDateTime() {\n if (!dummyDateTimeCache) {\n dummyDateTimeCache = DateTime.fromMillis(1555555555555);\n }\n\n return dummyDateTimeCache;\n}\n\nfunction maybeExpandMacroToken(token, locale) {\n if (token.literal) {\n return token;\n }\n\n const formatOpts = Formatter.macroTokenToFormatOpts(token.val);\n\n if (!formatOpts) {\n return token;\n }\n\n const formatter = Formatter.create(locale, formatOpts);\n const parts = formatter.formatDateTimeParts(getDummyDateTime());\n\n const tokens = parts.map(p => tokenForPart(p, locale, formatOpts));\n\n if (tokens.includes(undefined)) {\n return token;\n }\n\n return tokens;\n}\n\nfunction expandMacroTokens(tokens, locale) {\n return Array.prototype.concat(...tokens.map(t => maybeExpandMacroToken(t, locale)));\n}\n\n/**\n * @private\n */\n\nexport function explainFromTokens(locale, input, format) {\n const tokens = expandMacroTokens(Formatter.parseFormat(format), locale),\n units = tokens.map(t => unitForToken(t, locale)),\n disqualifyingUnit = units.find(t => t.invalidReason);\n\n if (disqualifyingUnit) {\n return { input, tokens, invalidReason: disqualifyingUnit.invalidReason };\n } else {\n const [regexString, handlers] = buildRegex(units),\n regex = RegExp(regexString, \"i\"),\n [rawMatches, matches] = match(input, regex, handlers),\n [result, zone] = matches ? dateTimeFromMatches(matches) : [null, null];\n\n return { input, tokens, regex, rawMatches, matches, result, zone };\n }\n}\n\nexport function parseFromTokens(locale, input, format) {\n const { result, zone, invalidReason } = explainFromTokens(locale, input, format);\n return [result, zone, invalidReason];\n}\n","import {\n integerBetween,\n isLeapYear,\n timeObject,\n daysInYear,\n daysInMonth,\n weeksInWeekYear,\n isInteger\n} from \"./util.js\";\nimport Invalid from \"./invalid.js\";\n\nconst nonLeapLadder = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334],\n leapLadder = [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335];\n\nfunction unitOutOfRange(unit, value) {\n return new Invalid(\n \"unit out of range\",\n `you specified ${value} (of type ${typeof value}) as a ${unit}, which is invalid`\n );\n}\n\nfunction dayOfWeek(year, month, day) {\n const js = new Date(Date.UTC(year, month - 1, day)).getUTCDay();\n return js === 0 ? 7 : js;\n}\n\nfunction computeOrdinal(year, month, day) {\n return day + (isLeapYear(year) ? leapLadder : nonLeapLadder)[month - 1];\n}\n\nfunction uncomputeOrdinal(year, ordinal) {\n const table = isLeapYear(year) ? leapLadder : nonLeapLadder,\n month0 = table.findIndex(i => i < ordinal),\n day = ordinal - table[month0];\n return { month: month0 + 1, day };\n}\n\n/**\n * @private\n */\n\nexport function gregorianToWeek(gregObj) {\n const { year, month, day } = gregObj,\n ordinal = computeOrdinal(year, month, day),\n weekday = dayOfWeek(year, month, day);\n\n let weekNumber = Math.floor((ordinal - weekday + 10) / 7),\n weekYear;\n\n if (weekNumber < 1) {\n weekYear = year - 1;\n weekNumber = weeksInWeekYear(weekYear);\n } else if (weekNumber > weeksInWeekYear(year)) {\n weekYear = year + 1;\n weekNumber = 1;\n } else {\n weekYear = year;\n }\n\n return Object.assign({ weekYear, weekNumber, weekday }, timeObject(gregObj));\n}\n\nexport function weekToGregorian(weekData) {\n const { weekYear, weekNumber, weekday } = weekData,\n weekdayOfJan4 = dayOfWeek(weekYear, 1, 4),\n yearInDays = daysInYear(weekYear);\n\n let ordinal = weekNumber * 7 + weekday - weekdayOfJan4 - 3,\n year;\n\n if (ordinal < 1) {\n year = weekYear - 1;\n ordinal += daysInYear(year);\n } else if (ordinal > yearInDays) {\n year = weekYear + 1;\n ordinal -= daysInYear(weekYear);\n } else {\n year = weekYear;\n }\n\n const { month, day } = uncomputeOrdinal(year, ordinal);\n\n return Object.assign({ year, month, day }, timeObject(weekData));\n}\n\nexport function gregorianToOrdinal(gregData) {\n const { year, month, day } = gregData,\n ordinal = computeOrdinal(year, month, day);\n\n return Object.assign({ year, ordinal }, timeObject(gregData));\n}\n\nexport function ordinalToGregorian(ordinalData) {\n const { year, ordinal } = ordinalData,\n { month, day } = uncomputeOrdinal(year, ordinal);\n\n return Object.assign({ year, month, day }, timeObject(ordinalData));\n}\n\nexport function hasInvalidWeekData(obj) {\n const validYear = isInteger(obj.weekYear),\n validWeek = integerBetween(obj.weekNumber, 1, weeksInWeekYear(obj.weekYear)),\n validWeekday = integerBetween(obj.weekday, 1, 7);\n\n if (!validYear) {\n return unitOutOfRange(\"weekYear\", obj.weekYear);\n } else if (!validWeek) {\n return unitOutOfRange(\"week\", obj.week);\n } else if (!validWeekday) {\n return unitOutOfRange(\"weekday\", obj.weekday);\n } else return false;\n}\n\nexport function hasInvalidOrdinalData(obj) {\n const validYear = isInteger(obj.year),\n validOrdinal = integerBetween(obj.ordinal, 1, daysInYear(obj.year));\n\n if (!validYear) {\n return unitOutOfRange(\"year\", obj.year);\n } else if (!validOrdinal) {\n return unitOutOfRange(\"ordinal\", obj.ordinal);\n } else return false;\n}\n\nexport function hasInvalidGregorianData(obj) {\n const validYear = isInteger(obj.year),\n validMonth = integerBetween(obj.month, 1, 12),\n validDay = integerBetween(obj.day, 1, daysInMonth(obj.year, obj.month));\n\n if (!validYear) {\n return unitOutOfRange(\"year\", obj.year);\n } else if (!validMonth) {\n return unitOutOfRange(\"month\", obj.month);\n } else if (!validDay) {\n return unitOutOfRange(\"day\", obj.day);\n } else return false;\n}\n\nexport function hasInvalidTimeData(obj) {\n const { hour, minute, second, millisecond } = obj;\n const validHour =\n integerBetween(hour, 0, 23) ||\n (hour === 24 && minute === 0 && second === 0 && millisecond === 0),\n validMinute = integerBetween(minute, 0, 59),\n validSecond = integerBetween(second, 0, 59),\n validMillisecond = integerBetween(millisecond, 0, 999);\n\n if (!validHour) {\n return unitOutOfRange(\"hour\", hour);\n } else if (!validMinute) {\n return unitOutOfRange(\"minute\", minute);\n } else if (!validSecond) {\n return unitOutOfRange(\"second\", second);\n } else if (!validMillisecond) {\n return unitOutOfRange(\"millisecond\", millisecond);\n } else return false;\n}\n","import Duration, { friendlyDuration } from \"./duration.js\";\nimport Interval from \"./interval.js\";\nimport Settings from \"./settings.js\";\nimport Info from \"./info.js\";\nimport Formatter from \"./impl/formatter.js\";\nimport FixedOffsetZone from \"./zones/fixedOffsetZone.js\";\nimport Locale from \"./impl/locale.js\";\nimport {\n isUndefined,\n maybeArray,\n isDate,\n isNumber,\n bestBy,\n daysInMonth,\n daysInYear,\n isLeapYear,\n weeksInWeekYear,\n normalizeObject,\n roundTo,\n objToLocalTS\n} from \"./impl/util.js\";\nimport { normalizeZone } from \"./impl/zoneUtil.js\";\nimport diff from \"./impl/diff.js\";\nimport { parseRFC2822Date, parseISODate, parseHTTPDate, parseSQL } from \"./impl/regexParser.js\";\nimport { parseFromTokens, explainFromTokens } from \"./impl/tokenParser.js\";\nimport {\n gregorianToWeek,\n weekToGregorian,\n gregorianToOrdinal,\n ordinalToGregorian,\n hasInvalidGregorianData,\n hasInvalidWeekData,\n hasInvalidOrdinalData,\n hasInvalidTimeData\n} from \"./impl/conversions.js\";\nimport * as Formats from \"./impl/formats.js\";\nimport {\n InvalidArgumentError,\n ConflictingSpecificationError,\n InvalidUnitError,\n InvalidDateTimeError\n} from \"./errors.js\";\nimport Invalid from \"./impl/invalid.js\";\n\nconst INVALID = \"Invalid DateTime\";\nconst MAX_DATE = 8.64e15;\n\nfunction unsupportedZone(zone) {\n return new Invalid(\"unsupported zone\", `the zone \"${zone.name}\" is not supported`);\n}\n\n// we cache week data on the DT object and this intermediates the cache\nfunction possiblyCachedWeekData(dt) {\n if (dt.weekData === null) {\n dt.weekData = gregorianToWeek(dt.c);\n }\n return dt.weekData;\n}\n\n// clone really means, \"make a new object with these modifications\". all \"setters\" really use this\n// to create a new object while only changing some of the properties\nfunction clone(inst, alts) {\n const current = {\n ts: inst.ts,\n zone: inst.zone,\n c: inst.c,\n o: inst.o,\n loc: inst.loc,\n invalid: inst.invalid\n };\n return new DateTime(Object.assign({}, current, alts, { old: current }));\n}\n\n// find the right offset a given local time. The o input is our guess, which determines which\n// offset we'll pick in ambiguous cases (e.g. there are two 3 AMs b/c Fallback DST)\nfunction fixOffset(localTS, o, tz) {\n // Our UTC time is just a guess because our offset is just a guess\n let utcGuess = localTS - o * 60 * 1000;\n\n // Test whether the zone matches the offset for this ts\n const o2 = tz.offset(utcGuess);\n\n // If so, offset didn't change and we're done\n if (o === o2) {\n return [utcGuess, o];\n }\n\n // If not, change the ts by the difference in the offset\n utcGuess -= (o2 - o) * 60 * 1000;\n\n // If that gives us the local time we want, we're done\n const o3 = tz.offset(utcGuess);\n if (o2 === o3) {\n return [utcGuess, o2];\n }\n\n // If it's different, we're in a hole time. The offset has changed, but the we don't adjust the time\n return [localTS - Math.min(o2, o3) * 60 * 1000, Math.max(o2, o3)];\n}\n\n// convert an epoch timestamp into a calendar object with the given offset\nfunction tsToObj(ts, offset) {\n ts += offset * 60 * 1000;\n\n const d = new Date(ts);\n\n return {\n year: d.getUTCFullYear(),\n month: d.getUTCMonth() + 1,\n day: d.getUTCDate(),\n hour: d.getUTCHours(),\n minute: d.getUTCMinutes(),\n second: d.getUTCSeconds(),\n millisecond: d.getUTCMilliseconds()\n };\n}\n\n// convert a calendar object to a epoch timestamp\nfunction objToTS(obj, offset, zone) {\n return fixOffset(objToLocalTS(obj), offset, zone);\n}\n\n// create a new DT instance by adding a duration, adjusting for DSTs\nfunction adjustTime(inst, dur) {\n const keys = Object.keys(dur.values);\n if (keys.indexOf(\"milliseconds\") === -1) {\n keys.push(\"milliseconds\");\n }\n\n dur = dur.shiftTo(...keys);\n\n const oPre = inst.o,\n year = inst.c.year + dur.years,\n month = inst.c.month + dur.months + dur.quarters * 3,\n c = Object.assign({}, inst.c, {\n year,\n month,\n day: Math.min(inst.c.day, daysInMonth(year, month)) + dur.days + dur.weeks * 7\n }),\n millisToAdd = Duration.fromObject({\n hours: dur.hours,\n minutes: dur.minutes,\n seconds: dur.seconds,\n milliseconds: dur.milliseconds\n }).as(\"milliseconds\"),\n localTS = objToLocalTS(c);\n\n let [ts, o] = fixOffset(localTS, oPre, inst.zone);\n\n if (millisToAdd !== 0) {\n ts += millisToAdd;\n // that could have changed the offset by going over a DST, but we want to keep the ts the same\n o = inst.zone.offset(ts);\n }\n\n return { ts, o };\n}\n\n// helper useful in turning the results of parsing into real dates\n// by handling the zone options\nfunction parseDataToDateTime(parsed, parsedZone, opts, format, text) {\n const { setZone, zone } = opts;\n if (parsed && Object.keys(parsed).length !== 0) {\n const interpretationZone = parsedZone || zone,\n inst = DateTime.fromObject(\n Object.assign(parsed, opts, {\n zone: interpretationZone,\n // setZone is a valid option in the calling methods, but not in fromObject\n setZone: undefined\n })\n );\n return setZone ? inst : inst.setZone(zone);\n } else {\n return DateTime.invalid(\n new Invalid(\"unparsable\", `the input \"${text}\" can't be parsed as ${format}`)\n );\n }\n}\n\n// if you want to output a technical format (e.g. RFC 2822), this helper\n// helps handle the details\nfunction toTechFormat(dt, format) {\n return dt.isValid\n ? Formatter.create(Locale.create(\"en-US\"), {\n allowZ: true,\n forceSimple: true\n }).formatDateTimeFromString(dt, format)\n : null;\n}\n\n// technical time formats (e.g. the time part of ISO 8601), take some options\n// and this commonizes their handling\nfunction toTechTimeFormat(\n dt,\n {\n suppressSeconds = false,\n suppressMilliseconds = false,\n includeOffset,\n includeZone = false,\n spaceZone = false\n }\n) {\n let fmt = \"HH:mm\";\n\n if (!suppressSeconds || dt.second !== 0 || dt.millisecond !== 0) {\n fmt += \":ss\";\n if (!suppressMilliseconds || dt.millisecond !== 0) {\n fmt += \".SSS\";\n }\n }\n\n if ((includeZone || includeOffset) && spaceZone) {\n fmt += \" \";\n }\n\n if (includeZone) {\n fmt += \"z\";\n } else if (includeOffset) {\n fmt += \"ZZ\";\n }\n\n return toTechFormat(dt, fmt);\n}\n\n// defaults for unspecified units in the supported calendars\nconst defaultUnitValues = {\n month: 1,\n day: 1,\n hour: 0,\n minute: 0,\n second: 0,\n millisecond: 0\n },\n defaultWeekUnitValues = {\n weekNumber: 1,\n weekday: 1,\n hour: 0,\n minute: 0,\n second: 0,\n millisecond: 0\n },\n defaultOrdinalUnitValues = {\n ordinal: 1,\n hour: 0,\n minute: 0,\n second: 0,\n millisecond: 0\n };\n\n// Units in the supported calendars, sorted by bigness\nconst orderedUnits = [\"year\", \"month\", \"day\", \"hour\", \"minute\", \"second\", \"millisecond\"],\n orderedWeekUnits = [\n \"weekYear\",\n \"weekNumber\",\n \"weekday\",\n \"hour\",\n \"minute\",\n \"second\",\n \"millisecond\"\n ],\n orderedOrdinalUnits = [\"year\", \"ordinal\", \"hour\", \"minute\", \"second\", \"millisecond\"];\n\n// standardize case and plurality in units\nfunction normalizeUnit(unit) {\n const normalized = {\n year: \"year\",\n years: \"year\",\n month: \"month\",\n months: \"month\",\n day: \"day\",\n days: \"day\",\n hour: \"hour\",\n hours: \"hour\",\n minute: \"minute\",\n minutes: \"minute\",\n second: \"second\",\n seconds: \"second\",\n millisecond: \"millisecond\",\n milliseconds: \"millisecond\",\n weekday: \"weekday\",\n weekdays: \"weekday\",\n weeknumber: \"weekNumber\",\n weeksnumber: \"weekNumber\",\n weeknumbers: \"weekNumber\",\n weekyear: \"weekYear\",\n weekyears: \"weekYear\",\n ordinal: \"ordinal\"\n }[unit.toLowerCase()];\n\n if (!normalized) throw new InvalidUnitError(unit);\n\n return normalized;\n}\n\n// this is a dumbed down version of fromObject() that runs about 60% faster\n// but doesn't do any validation, makes a bunch of assumptions about what units\n// are present, and so on.\nfunction quickDT(obj, zone) {\n // assume we have the higher-order units\n for (const u of orderedUnits) {\n if (isUndefined(obj[u])) {\n obj[u] = defaultUnitValues[u];\n }\n }\n\n const invalid = hasInvalidGregorianData(obj) || hasInvalidTimeData(obj);\n if (invalid) {\n return DateTime.invalid(invalid);\n }\n\n const tsNow = Settings.now(),\n offsetProvis = zone.offset(tsNow),\n [ts, o] = objToTS(obj, offsetProvis, zone);\n\n return new DateTime({\n ts,\n zone,\n o\n });\n}\n\nfunction diffRelative(start, end, opts) {\n const round = isUndefined(opts.round) ? true : opts.round,\n format = (c, unit) => {\n c = roundTo(c, round || opts.calendary ? 0 : 2, true);\n const formatter = end.loc.clone(opts).relFormatter(opts);\n return formatter.format(c, unit);\n },\n differ = unit => {\n if (opts.calendary) {\n if (!end.hasSame(start, unit)) {\n return end\n .startOf(unit)\n .diff(start.startOf(unit), unit)\n .get(unit);\n } else return 0;\n } else {\n return end.diff(start, unit).get(unit);\n }\n };\n\n if (opts.unit) {\n return format(differ(opts.unit), opts.unit);\n }\n\n for (const unit of opts.units) {\n const count = differ(unit);\n if (Math.abs(count) >= 1) {\n return format(count, unit);\n }\n }\n return format(0, opts.units[opts.units.length - 1]);\n}\n\n/**\n * A DateTime is an immutable data structure representing a specific date and time and accompanying methods. It contains class and instance methods for creating, parsing, interrogating, transforming, and formatting them.\n *\n * A DateTime comprises of:\n * * A timestamp. Each DateTime instance refers to a specific millisecond of the Unix epoch.\n * * A time zone. Each instance is considered in the context of a specific zone (by default the local system's zone).\n * * Configuration properties that effect how output strings are formatted, such as `locale`, `numberingSystem`, and `outputCalendar`.\n *\n * Here is a brief overview of the most commonly used functionality it provides:\n *\n * * **Creation**: To create a DateTime from its components, use one of its factory class methods: {@link local}, {@link utc}, and (most flexibly) {@link fromObject}. To create one from a standard string format, use {@link fromISO}, {@link fromHTTP}, and {@link fromRFC2822}. To create one from a custom string format, use {@link fromFormat}. To create one from a native JS date, use {@link fromJSDate}.\n * * **Gregorian calendar and time**: To examine the Gregorian properties of a DateTime individually (i.e as opposed to collectively through {@link toObject}), use the {@link year}, {@link month},\n * {@link day}, {@link hour}, {@link minute}, {@link second}, {@link millisecond} accessors.\n * * **Week calendar**: For ISO week calendar attributes, see the {@link weekYear}, {@link weekNumber}, and {@link weekday} accessors.\n * * **Configuration** See the {@link locale} and {@link numberingSystem} accessors.\n * * **Transformation**: To transform the DateTime into other DateTimes, use {@link set}, {@link reconfigure}, {@link setZone}, {@link setLocale}, {@link plus}, {@link minus}, {@link endOf}, {@link startOf}, {@link toUTC}, and {@link toLocal}.\n * * **Output**: To convert the DateTime to other representations, use the {@link toRelative}, {@link toRelativeCalendar}, {@link toJSON}, {@link toISO}, {@link toHTTP}, {@link toObject}, {@link toRFC2822}, {@link toString}, {@link toLocaleString}, {@link toFormat}, {@link toMillis} and {@link toJSDate}.\n *\n * There's plenty others documented below. In addition, for more information on subtler topics like internationalization, time zones, alternative calendars, validity, and so on, see the external documentation.\n */\nexport default class DateTime {\n /**\n * @access private\n */\n constructor(config) {\n const zone = config.zone || Settings.defaultZone;\n\n let invalid =\n config.invalid ||\n (Number.isNaN(config.ts) ? new Invalid(\"invalid input\") : null) ||\n (!zone.isValid ? unsupportedZone(zone) : null);\n /**\n * @access private\n */\n this.ts = isUndefined(config.ts) ? Settings.now() : config.ts;\n\n let c = null,\n o = null;\n if (!invalid) {\n const unchanged = config.old && config.old.ts === this.ts && config.old.zone.equals(zone);\n\n if (unchanged) {\n [c, o] = [config.old.c, config.old.o];\n } else {\n c = tsToObj(this.ts, zone.offset(this.ts));\n invalid = Number.isNaN(c.year) ? new Invalid(\"invalid input\") : null;\n c = invalid ? null : c;\n o = invalid ? null : zone.offset(this.ts);\n }\n }\n\n /**\n * @access private\n */\n this._zone = zone;\n /**\n * @access private\n */\n this.loc = config.loc || Locale.create();\n /**\n * @access private\n */\n this.invalid = invalid;\n /**\n * @access private\n */\n this.weekData = null;\n /**\n * @access private\n */\n this.c = c;\n /**\n * @access private\n */\n this.o = o;\n /**\n * @access private\n */\n this.isLuxonDateTime = true;\n }\n\n // CONSTRUCT\n\n /**\n * Create a local DateTime\n * @param {number} [year] - The calendar year. If omitted (as in, call `local()` with no arguments), the current time will be used\n * @param {number} [month=1] - The month, 1-indexed\n * @param {number} [day=1] - The day of the month\n * @param {number} [hour=0] - The hour of the day, in 24-hour time\n * @param {number} [minute=0] - The minute of the hour, i.e. a number between 0 and 59\n * @param {number} [second=0] - The second of the minute, i.e. a number between 0 and 59\n * @param {number} [millisecond=0] - The millisecond of the second, i.e. a number between 0 and 999\n * @example DateTime.local() //~> now\n * @example DateTime.local(2017) //~> 2017-01-01T00:00:00\n * @example DateTime.local(2017, 3) //~> 2017-03-01T00:00:00\n * @example DateTime.local(2017, 3, 12) //~> 2017-03-12T00:00:00\n * @example DateTime.local(2017, 3, 12, 5) //~> 2017-03-12T05:00:00\n * @example DateTime.local(2017, 3, 12, 5, 45) //~> 2017-03-12T05:45:00\n * @example DateTime.local(2017, 3, 12, 5, 45, 10) //~> 2017-03-12T05:45:10\n * @example DateTime.local(2017, 3, 12, 5, 45, 10, 765) //~> 2017-03-12T05:45:10.765\n * @return {DateTime}\n */\n static local(year, month, day, hour, minute, second, millisecond) {\n if (isUndefined(year)) {\n return new DateTime({ ts: Settings.now() });\n } else {\n return quickDT(\n {\n year,\n month,\n day,\n hour,\n minute,\n second,\n millisecond\n },\n Settings.defaultZone\n );\n }\n }\n\n /**\n * Create a DateTime in UTC\n * @param {number} [year] - The calendar year. If omitted (as in, call `utc()` with no arguments), the current time will be used\n * @param {number} [month=1] - The month, 1-indexed\n * @param {number} [day=1] - The day of the month\n * @param {number} [hour=0] - The hour of the day, in 24-hour time\n * @param {number} [minute=0] - The minute of the hour, i.e. a number between 0 and 59\n * @param {number} [second=0] - The second of the minute, i.e. a number between 0 and 59\n * @param {number} [millisecond=0] - The millisecond of the second, i.e. a number between 0 and 999\n * @example DateTime.utc() //~> now\n * @example DateTime.utc(2017) //~> 2017-01-01T00:00:00Z\n * @example DateTime.utc(2017, 3) //~> 2017-03-01T00:00:00Z\n * @example DateTime.utc(2017, 3, 12) //~> 2017-03-12T00:00:00Z\n * @example DateTime.utc(2017, 3, 12, 5) //~> 2017-03-12T05:00:00Z\n * @example DateTime.utc(2017, 3, 12, 5, 45) //~> 2017-03-12T05:45:00Z\n * @example DateTime.utc(2017, 3, 12, 5, 45, 10) //~> 2017-03-12T05:45:10Z\n * @example DateTime.utc(2017, 3, 12, 5, 45, 10, 765) //~> 2017-03-12T05:45:10.765Z\n * @return {DateTime}\n */\n static utc(year, month, day, hour, minute, second, millisecond) {\n if (isUndefined(year)) {\n return new DateTime({\n ts: Settings.now(),\n zone: FixedOffsetZone.utcInstance\n });\n } else {\n return quickDT(\n {\n year,\n month,\n day,\n hour,\n minute,\n second,\n millisecond\n },\n FixedOffsetZone.utcInstance\n );\n }\n }\n\n /**\n * Create a DateTime from a Javascript Date object. Uses the default zone.\n * @param {Date} date - a Javascript Date object\n * @param {Object} options - configuration options for the DateTime\n * @param {string|Zone} [options.zone='local'] - the zone to place the DateTime into\n * @return {DateTime}\n */\n static fromJSDate(date, options = {}) {\n const ts = isDate(date) ? date.valueOf() : NaN;\n if (Number.isNaN(ts)) {\n return DateTime.invalid(\"invalid input\");\n }\n\n const zoneToUse = normalizeZone(options.zone, Settings.defaultZone);\n if (!zoneToUse.isValid) {\n return DateTime.invalid(unsupportedZone(zoneToUse));\n }\n\n return new DateTime({\n ts: ts,\n zone: zoneToUse,\n loc: Locale.fromObject(options)\n });\n }\n\n /**\n * Create a DateTime from a number of milliseconds since the epoch (i.e. since 1 January 1970 00:00:00 UTC). Uses the default zone.\n * @param {number} milliseconds - a number of milliseconds since 1970 UTC\n * @param {Object} options - configuration options for the DateTime\n * @param {string|Zone} [options.zone='local'] - the zone to place the DateTime into\n * @param {string} [options.locale] - a locale to set on the resulting DateTime instance\n * @param {string} options.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @param {string} options.numberingSystem - the numbering system to set on the resulting DateTime instance\n * @return {DateTime}\n */\n static fromMillis(milliseconds, options = {}) {\n if (!isNumber(milliseconds)) {\n throw new InvalidArgumentError(\"fromMillis requires a numerical input\");\n } else if (milliseconds < -MAX_DATE || milliseconds > MAX_DATE) {\n // this isn't perfect because because we can still end up out of range because of additional shifting, but it's a start\n return DateTime.invalid(\"Timestamp out of range\");\n } else {\n return new DateTime({\n ts: milliseconds,\n zone: normalizeZone(options.zone, Settings.defaultZone),\n loc: Locale.fromObject(options)\n });\n }\n }\n\n /**\n * Create a DateTime from a number of seconds since the epoch (i.e. since 1 January 1970 00:00:00 UTC). Uses the default zone.\n * @param {number} seconds - a number of seconds since 1970 UTC\n * @param {Object} options - configuration options for the DateTime\n * @param {string|Zone} [options.zone='local'] - the zone to place the DateTime into\n * @param {string} [options.locale] - a locale to set on the resulting DateTime instance\n * @param {string} options.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @param {string} options.numberingSystem - the numbering system to set on the resulting DateTime instance\n * @return {DateTime}\n */\n static fromSeconds(seconds, options = {}) {\n if (!isNumber(seconds)) {\n throw new InvalidArgumentError(\"fromSeconds requires a numerical input\");\n } else {\n return new DateTime({\n ts: seconds * 1000,\n zone: normalizeZone(options.zone, Settings.defaultZone),\n loc: Locale.fromObject(options)\n });\n }\n }\n\n /**\n * Create a DateTime from a Javascript object with keys like 'year' and 'hour' with reasonable defaults.\n * @param {Object} obj - the object to create the DateTime from\n * @param {number} obj.year - a year, such as 1987\n * @param {number} obj.month - a month, 1-12\n * @param {number} obj.day - a day of the month, 1-31, depending on the month\n * @param {number} obj.ordinal - day of the year, 1-365 or 366\n * @param {number} obj.weekYear - an ISO week year\n * @param {number} obj.weekNumber - an ISO week number, between 1 and 52 or 53, depending on the year\n * @param {number} obj.weekday - an ISO weekday, 1-7, where 1 is Monday and 7 is Sunday\n * @param {number} obj.hour - hour of the day, 0-23\n * @param {number} obj.minute - minute of the hour, 0-59\n * @param {number} obj.second - second of the minute, 0-59\n * @param {number} obj.millisecond - millisecond of the second, 0-999\n * @param {string|Zone} [obj.zone='local'] - interpret the numbers in the context of a particular zone. Can take any value taken as the first argument to setZone()\n * @param {string} [obj.locale='system's locale'] - a locale to set on the resulting DateTime instance\n * @param {string} obj.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @param {string} obj.numberingSystem - the numbering system to set on the resulting DateTime instance\n * @example DateTime.fromObject({ year: 1982, month: 5, day: 25}).toISODate() //=> '1982-05-25'\n * @example DateTime.fromObject({ year: 1982 }).toISODate() //=> '1982-01-01'\n * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6 }) //~> today at 10:26:06\n * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6, zone: 'utc' }),\n * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6, zone: 'local' })\n * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6, zone: 'America/New_York' })\n * @example DateTime.fromObject({ weekYear: 2016, weekNumber: 2, weekday: 3 }).toISODate() //=> '2016-01-13'\n * @return {DateTime}\n */\n static fromObject(obj) {\n const zoneToUse = normalizeZone(obj.zone, Settings.defaultZone);\n if (!zoneToUse.isValid) {\n return DateTime.invalid(unsupportedZone(zoneToUse));\n }\n\n const tsNow = Settings.now(),\n offsetProvis = zoneToUse.offset(tsNow),\n normalized = normalizeObject(obj, normalizeUnit, [\n \"zone\",\n \"locale\",\n \"outputCalendar\",\n \"numberingSystem\"\n ]),\n containsOrdinal = !isUndefined(normalized.ordinal),\n containsGregorYear = !isUndefined(normalized.year),\n containsGregorMD = !isUndefined(normalized.month) || !isUndefined(normalized.day),\n containsGregor = containsGregorYear || containsGregorMD,\n definiteWeekDef = normalized.weekYear || normalized.weekNumber,\n loc = Locale.fromObject(obj);\n\n // cases:\n // just a weekday -> this week's instance of that weekday, no worries\n // (gregorian data or ordinal) + (weekYear or weekNumber) -> error\n // (gregorian month or day) + ordinal -> error\n // otherwise just use weeks or ordinals or gregorian, depending on what's specified\n\n if ((containsGregor || containsOrdinal) && definiteWeekDef) {\n throw new ConflictingSpecificationError(\n \"Can't mix weekYear/weekNumber units with year/month/day or ordinals\"\n );\n }\n\n if (containsGregorMD && containsOrdinal) {\n throw new ConflictingSpecificationError(\"Can't mix ordinal dates with month/day\");\n }\n\n const useWeekData = definiteWeekDef || (normalized.weekday && !containsGregor);\n\n // configure ourselves to deal with gregorian dates or week stuff\n let units,\n defaultValues,\n objNow = tsToObj(tsNow, offsetProvis);\n if (useWeekData) {\n units = orderedWeekUnits;\n defaultValues = defaultWeekUnitValues;\n objNow = gregorianToWeek(objNow);\n } else if (containsOrdinal) {\n units = orderedOrdinalUnits;\n defaultValues = defaultOrdinalUnitValues;\n objNow = gregorianToOrdinal(objNow);\n } else {\n units = orderedUnits;\n defaultValues = defaultUnitValues;\n }\n\n // set default values for missing stuff\n let foundFirst = false;\n for (const u of units) {\n const v = normalized[u];\n if (!isUndefined(v)) {\n foundFirst = true;\n } else if (foundFirst) {\n normalized[u] = defaultValues[u];\n } else {\n normalized[u] = objNow[u];\n }\n }\n\n // make sure the values we have are in range\n const higherOrderInvalid = useWeekData\n ? hasInvalidWeekData(normalized)\n : containsOrdinal\n ? hasInvalidOrdinalData(normalized)\n : hasInvalidGregorianData(normalized),\n invalid = higherOrderInvalid || hasInvalidTimeData(normalized);\n\n if (invalid) {\n return DateTime.invalid(invalid);\n }\n\n // compute the actual time\n const gregorian = useWeekData\n ? weekToGregorian(normalized)\n : containsOrdinal\n ? ordinalToGregorian(normalized)\n : normalized,\n [tsFinal, offsetFinal] = objToTS(gregorian, offsetProvis, zoneToUse),\n inst = new DateTime({\n ts: tsFinal,\n zone: zoneToUse,\n o: offsetFinal,\n loc\n });\n\n // gregorian data + weekday serves only to validate\n if (normalized.weekday && containsGregor && obj.weekday !== inst.weekday) {\n return DateTime.invalid(\n \"mismatched weekday\",\n `you can't specify both a weekday of ${normalized.weekday} and a date of ${inst.toISO()}`\n );\n }\n\n return inst;\n }\n\n /**\n * Create a DateTime from an ISO 8601 string\n * @param {string} text - the ISO string\n * @param {Object} opts - options to affect the creation\n * @param {string|Zone} [opts.zone='local'] - use this zone if no offset is specified in the input string itself. Will also convert the time to this zone\n * @param {boolean} [opts.setZone=false] - override the zone with a fixed-offset zone specified in the string itself, if it specifies one\n * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance\n * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance\n * @example DateTime.fromISO('2016-05-25T09:08:34.123')\n * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00')\n * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00', {setZone: true})\n * @example DateTime.fromISO('2016-05-25T09:08:34.123', {zone: 'utc'})\n * @example DateTime.fromISO('2016-W05-4')\n * @return {DateTime}\n */\n static fromISO(text, opts = {}) {\n const [vals, parsedZone] = parseISODate(text);\n return parseDataToDateTime(vals, parsedZone, opts, \"ISO 8601\", text);\n }\n\n /**\n * Create a DateTime from an RFC 2822 string\n * @param {string} text - the RFC 2822 string\n * @param {Object} opts - options to affect the creation\n * @param {string|Zone} [opts.zone='local'] - convert the time to this zone. Since the offset is always specified in the string itself, this has no effect on the interpretation of string, merely the zone the resulting DateTime is expressed in.\n * @param {boolean} [opts.setZone=false] - override the zone with a fixed-offset zone specified in the string itself, if it specifies one\n * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance\n * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance\n * @example DateTime.fromRFC2822('25 Nov 2016 13:23:12 GMT')\n * @example DateTime.fromRFC2822('Fri, 25 Nov 2016 13:23:12 +0600')\n * @example DateTime.fromRFC2822('25 Nov 2016 13:23 Z')\n * @return {DateTime}\n */\n static fromRFC2822(text, opts = {}) {\n const [vals, parsedZone] = parseRFC2822Date(text);\n return parseDataToDateTime(vals, parsedZone, opts, \"RFC 2822\", text);\n }\n\n /**\n * Create a DateTime from an HTTP header date\n * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3.1\n * @param {string} text - the HTTP header date\n * @param {Object} opts - options to affect the creation\n * @param {string|Zone} [opts.zone='local'] - convert the time to this zone. Since HTTP dates are always in UTC, this has no effect on the interpretation of string, merely the zone the resulting DateTime is expressed in.\n * @param {boolean} [opts.setZone=false] - override the zone with the fixed-offset zone specified in the string. For HTTP dates, this is always UTC, so this option is equivalent to setting the `zone` option to 'utc', but this option is included for consistency with similar methods.\n * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance\n * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance\n * @example DateTime.fromHTTP('Sun, 06 Nov 1994 08:49:37 GMT')\n * @example DateTime.fromHTTP('Sunday, 06-Nov-94 08:49:37 GMT')\n * @example DateTime.fromHTTP('Sun Nov 6 08:49:37 1994')\n * @return {DateTime}\n */\n static fromHTTP(text, opts = {}) {\n const [vals, parsedZone] = parseHTTPDate(text);\n return parseDataToDateTime(vals, parsedZone, opts, \"HTTP\", opts);\n }\n\n /**\n * Create a DateTime from an input string and format string.\n * Defaults to en-US if no locale has been specified, regardless of the system's locale.\n * @see https://moment.github.io/luxon/docs/manual/parsing.html#table-of-tokens\n * @param {string} text - the string to parse\n * @param {string} fmt - the format the string is expected to be in (see the link below for the formats)\n * @param {Object} opts - options to affect the creation\n * @param {string|Zone} [opts.zone='local'] - use this zone if no offset is specified in the input string itself. Will also convert the DateTime to this zone\n * @param {boolean} [opts.setZone=false] - override the zone with a zone specified in the string itself, if it specifies one\n * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale\n * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system\n * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @return {DateTime}\n */\n static fromFormat(text, fmt, opts = {}) {\n if (isUndefined(text) || isUndefined(fmt)) {\n throw new InvalidArgumentError(\"fromFormat requires an input string and a format\");\n }\n\n const { locale = null, numberingSystem = null } = opts,\n localeToUse = Locale.fromOpts({\n locale,\n numberingSystem,\n defaultToEN: true\n }),\n [vals, parsedZone, invalid] = parseFromTokens(localeToUse, text, fmt);\n if (invalid) {\n return DateTime.invalid(invalid);\n } else {\n return parseDataToDateTime(vals, parsedZone, opts, `format ${fmt}`, text);\n }\n }\n\n /**\n * @deprecated use fromFormat instead\n */\n static fromString(text, fmt, opts = {}) {\n return DateTime.fromFormat(text, fmt, opts);\n }\n\n /**\n * Create a DateTime from a SQL date, time, or datetime\n * Defaults to en-US if no locale has been specified, regardless of the system's locale\n * @param {string} text - the string to parse\n * @param {Object} opts - options to affect the creation\n * @param {string|Zone} [opts.zone='local'] - use this zone if no offset is specified in the input string itself. Will also convert the DateTime to this zone\n * @param {boolean} [opts.setZone=false] - override the zone with a zone specified in the string itself, if it specifies one\n * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale\n * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system\n * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance\n * @example DateTime.fromSQL('2017-05-15')\n * @example DateTime.fromSQL('2017-05-15 09:12:34')\n * @example DateTime.fromSQL('2017-05-15 09:12:34.342')\n * @example DateTime.fromSQL('2017-05-15 09:12:34.342+06:00')\n * @example DateTime.fromSQL('2017-05-15 09:12:34.342 America/Los_Angeles')\n * @example DateTime.fromSQL('2017-05-15 09:12:34.342 America/Los_Angeles', { setZone: true })\n * @example DateTime.fromSQL('2017-05-15 09:12:34.342', { zone: 'America/Los_Angeles' })\n * @example DateTime.fromSQL('09:12:34.342')\n * @return {DateTime}\n */\n static fromSQL(text, opts = {}) {\n const [vals, parsedZone] = parseSQL(text);\n return parseDataToDateTime(vals, parsedZone, opts, \"SQL\", text);\n }\n\n /**\n * Create an invalid DateTime.\n * @param {string} reason - simple string of why this DateTime is invalid. Should not contain parameters or anything else data-dependent\n * @param {string} [explanation=null] - longer explanation, may include parameters and other useful debugging information\n * @return {DateTime}\n */\n static invalid(reason, explanation = null) {\n if (!reason) {\n throw new InvalidArgumentError(\"need to specify a reason the DateTime is invalid\");\n }\n\n const invalid = reason instanceof Invalid ? reason : new Invalid(reason, explanation);\n\n if (Settings.throwOnInvalid) {\n throw new InvalidDateTimeError(invalid);\n } else {\n return new DateTime({ invalid });\n }\n }\n\n /**\n * Check if an object is a DateTime. Works across context boundaries\n * @param {object} o\n * @return {boolean}\n */\n static isDateTime(o) {\n return (o && o.isLuxonDateTime) || false;\n }\n\n // INFO\n\n /**\n * Get the value of unit.\n * @param {string} unit - a unit such as 'minute' or 'day'\n * @example DateTime.local(2017, 7, 4).get('month'); //=> 7\n * @example DateTime.local(2017, 7, 4).get('day'); //=> 4\n * @return {number}\n */\n get(unit) {\n return this[unit];\n }\n\n /**\n * Returns whether the DateTime is valid. Invalid DateTimes occur when:\n * * The DateTime was created from invalid calendar information, such as the 13th month or February 30\n * * The DateTime was created by an operation on another invalid date\n * @type {boolean}\n */\n get isValid() {\n return this.invalid === null;\n }\n\n /**\n * Returns an error code if this DateTime is invalid, or null if the DateTime is valid\n * @type {string}\n */\n get invalidReason() {\n return this.invalid ? this.invalid.reason : null;\n }\n\n /**\n * Returns an explanation of why this DateTime became invalid, or null if the DateTime is valid\n * @type {string}\n */\n get invalidExplanation() {\n return this.invalid ? this.invalid.explanation : null;\n }\n\n /**\n * Get the locale of a DateTime, such 'en-GB'. The locale is used when formatting the DateTime\n *\n * @type {string}\n */\n get locale() {\n return this.isValid ? this.loc.locale : null;\n }\n\n /**\n * Get the numbering system of a DateTime, such 'beng'. The numbering system is used when formatting the DateTime\n *\n * @type {string}\n */\n get numberingSystem() {\n return this.isValid ? this.loc.numberingSystem : null;\n }\n\n /**\n * Get the output calendar of a DateTime, such 'islamic'. The output calendar is used when formatting the DateTime\n *\n * @type {string}\n */\n get outputCalendar() {\n return this.isValid ? this.loc.outputCalendar : null;\n }\n\n /**\n * Get the time zone associated with this DateTime.\n * @type {Zone}\n */\n get zone() {\n return this._zone;\n }\n\n /**\n * Get the name of the time zone.\n * @type {string}\n */\n get zoneName() {\n return this.isValid ? this.zone.name : null;\n }\n\n /**\n * Get the year\n * @example DateTime.local(2017, 5, 25).year //=> 2017\n * @type {number}\n */\n get year() {\n return this.isValid ? this.c.year : NaN;\n }\n\n /**\n * Get the quarter\n * @example DateTime.local(2017, 5, 25).quarter //=> 2\n * @type {number}\n */\n get quarter() {\n return this.isValid ? Math.ceil(this.c.month / 3) : NaN;\n }\n\n /**\n * Get the month (1-12).\n * @example DateTime.local(2017, 5, 25).month //=> 5\n * @type {number}\n */\n get month() {\n return this.isValid ? this.c.month : NaN;\n }\n\n /**\n * Get the day of the month (1-30ish).\n * @example DateTime.local(2017, 5, 25).day //=> 25\n * @type {number}\n */\n get day() {\n return this.isValid ? this.c.day : NaN;\n }\n\n /**\n * Get the hour of the day (0-23).\n * @example DateTime.local(2017, 5, 25, 9).hour //=> 9\n * @type {number}\n */\n get hour() {\n return this.isValid ? this.c.hour : NaN;\n }\n\n /**\n * Get the minute of the hour (0-59).\n * @example DateTime.local(2017, 5, 25, 9, 30).minute //=> 30\n * @type {number}\n */\n get minute() {\n return this.isValid ? this.c.minute : NaN;\n }\n\n /**\n * Get the second of the minute (0-59).\n * @example DateTime.local(2017, 5, 25, 9, 30, 52).second //=> 52\n * @type {number}\n */\n get second() {\n return this.isValid ? this.c.second : NaN;\n }\n\n /**\n * Get the millisecond of the second (0-999).\n * @example DateTime.local(2017, 5, 25, 9, 30, 52, 654).millisecond //=> 654\n * @type {number}\n */\n get millisecond() {\n return this.isValid ? this.c.millisecond : NaN;\n }\n\n /**\n * Get the week year\n * @see https://en.wikipedia.org/wiki/ISO_week_date\n * @example DateTime.local(2014, 11, 31).weekYear //=> 2015\n * @type {number}\n */\n get weekYear() {\n return this.isValid ? possiblyCachedWeekData(this).weekYear : NaN;\n }\n\n /**\n * Get the week number of the week year (1-52ish).\n * @see https://en.wikipedia.org/wiki/ISO_week_date\n * @example DateTime.local(2017, 5, 25).weekNumber //=> 21\n * @type {number}\n */\n get weekNumber() {\n return this.isValid ? possiblyCachedWeekData(this).weekNumber : NaN;\n }\n\n /**\n * Get the day of the week.\n * 1 is Monday and 7 is Sunday\n * @see https://en.wikipedia.org/wiki/ISO_week_date\n * @example DateTime.local(2014, 11, 31).weekday //=> 4\n * @type {number}\n */\n get weekday() {\n return this.isValid ? possiblyCachedWeekData(this).weekday : NaN;\n }\n\n /**\n * Get the ordinal (i.e. the day of the year)\n * @example DateTime.local(2017, 5, 25).ordinal //=> 145\n * @type {number|DateTime}\n */\n get ordinal() {\n return this.isValid ? gregorianToOrdinal(this.c).ordinal : NaN;\n }\n\n /**\n * Get the human readable short month name, such as 'Oct'.\n * Defaults to the system's locale if no locale has been specified\n * @example DateTime.local(2017, 10, 30).monthShort //=> Oct\n * @type {string}\n */\n get monthShort() {\n return this.isValid ? Info.months(\"short\", { locale: this.locale })[this.month - 1] : null;\n }\n\n /**\n * Get the human readable long month name, such as 'October'.\n * Defaults to the system's locale if no locale has been specified\n * @example DateTime.local(2017, 10, 30).monthLong //=> October\n * @type {string}\n */\n get monthLong() {\n return this.isValid ? Info.months(\"long\", { locale: this.locale })[this.month - 1] : null;\n }\n\n /**\n * Get the human readable short weekday, such as 'Mon'.\n * Defaults to the system's locale if no locale has been specified\n * @example DateTime.local(2017, 10, 30).weekdayShort //=> Mon\n * @type {string}\n */\n get weekdayShort() {\n return this.isValid ? Info.weekdays(\"short\", { locale: this.locale })[this.weekday - 1] : null;\n }\n\n /**\n * Get the human readable long weekday, such as 'Monday'.\n * Defaults to the system's locale if no locale has been specified\n * @example DateTime.local(2017, 10, 30).weekdayLong //=> Monday\n * @type {string}\n */\n get weekdayLong() {\n return this.isValid ? Info.weekdays(\"long\", { locale: this.locale })[this.weekday - 1] : null;\n }\n\n /**\n * Get the UTC offset of this DateTime in minutes\n * @example DateTime.local().offset //=> -240\n * @example DateTime.utc().offset //=> 0\n * @type {number}\n */\n get offset() {\n return this.isValid ? this.zone.offset(this.ts) : NaN;\n }\n\n /**\n * Get the short human name for the zone's current offset, for example \"EST\" or \"EDT\".\n * Defaults to the system's locale if no locale has been specified\n * @type {string}\n */\n get offsetNameShort() {\n if (this.isValid) {\n return this.zone.offsetName(this.ts, {\n format: \"short\",\n locale: this.locale\n });\n } else {\n return null;\n }\n }\n\n /**\n * Get the long human name for the zone's current offset, for example \"Eastern Standard Time\" or \"Eastern Daylight Time\".\n * Defaults to the system's locale if no locale has been specified\n * @type {string}\n */\n get offsetNameLong() {\n if (this.isValid) {\n return this.zone.offsetName(this.ts, {\n format: \"long\",\n locale: this.locale\n });\n } else {\n return null;\n }\n }\n\n /**\n * Get whether this zone's offset ever changes, as in a DST.\n * @type {boolean}\n */\n get isOffsetFixed() {\n return this.isValid ? this.zone.universal : null;\n }\n\n /**\n * Get whether the DateTime is in a DST.\n * @type {boolean}\n */\n get isInDST() {\n if (this.isOffsetFixed) {\n return false;\n } else {\n return (\n this.offset > this.set({ month: 1 }).offset || this.offset > this.set({ month: 5 }).offset\n );\n }\n }\n\n /**\n * Returns true if this DateTime is in a leap year, false otherwise\n * @example DateTime.local(2016).isInLeapYear //=> true\n * @example DateTime.local(2013).isInLeapYear //=> false\n * @type {boolean}\n */\n get isInLeapYear() {\n return isLeapYear(this.year);\n }\n\n /**\n * Returns the number of days in this DateTime's month\n * @example DateTime.local(2016, 2).daysInMonth //=> 29\n * @example DateTime.local(2016, 3).daysInMonth //=> 31\n * @type {number}\n */\n get daysInMonth() {\n return daysInMonth(this.year, this.month);\n }\n\n /**\n * Returns the number of days in this DateTime's year\n * @example DateTime.local(2016).daysInYear //=> 366\n * @example DateTime.local(2013).daysInYear //=> 365\n * @type {number}\n */\n get daysInYear() {\n return this.isValid ? daysInYear(this.year) : NaN;\n }\n\n /**\n * Returns the number of weeks in this DateTime's year\n * @see https://en.wikipedia.org/wiki/ISO_week_date\n * @example DateTime.local(2004).weeksInWeekYear //=> 53\n * @example DateTime.local(2013).weeksInWeekYear //=> 52\n * @type {number}\n */\n get weeksInWeekYear() {\n return this.isValid ? weeksInWeekYear(this.weekYear) : NaN;\n }\n\n /**\n * Returns the resolved Intl options for this DateTime.\n * This is useful in understanding the behavior of formatting methods\n * @param {Object} opts - the same options as toLocaleString\n * @return {Object}\n */\n resolvedLocaleOpts(opts = {}) {\n const { locale, numberingSystem, calendar } = Formatter.create(\n this.loc.clone(opts),\n opts\n ).resolvedOptions(this);\n return { locale, numberingSystem, outputCalendar: calendar };\n }\n\n // TRANSFORM\n\n /**\n * \"Set\" the DateTime's zone to UTC. Returns a newly-constructed DateTime.\n *\n * Equivalent to {@link setZone}('utc')\n * @param {number} [offset=0] - optionally, an offset from UTC in minutes\n * @param {Object} [opts={}] - options to pass to `setZone()`\n * @return {DateTime}\n */\n toUTC(offset = 0, opts = {}) {\n return this.setZone(FixedOffsetZone.instance(offset), opts);\n }\n\n /**\n * \"Set\" the DateTime's zone to the host's local zone. Returns a newly-constructed DateTime.\n *\n * Equivalent to `setZone('local')`\n * @return {DateTime}\n */\n toLocal() {\n return this.setZone(Settings.defaultZone);\n }\n\n /**\n * \"Set\" the DateTime's zone to specified zone. Returns a newly-constructed DateTime.\n *\n * By default, the setter keeps the underlying time the same (as in, the same timestamp), but the new instance will report different local times and consider DSTs when making computations, as with {@link plus}. You may wish to use {@link toLocal} and {@link toUTC} which provide simple convenience wrappers for commonly used zones.\n * @param {string|Zone} [zone='local'] - a zone identifier. As a string, that can be any IANA zone supported by the host environment, or a fixed-offset name of the form 'UTC+3', or the strings 'local' or 'utc'. You may also supply an instance of a {@link Zone} class.\n * @param {Object} opts - options\n * @param {boolean} [opts.keepLocalTime=false] - If true, adjust the underlying time so that the local time stays the same, but in the target zone. You should rarely need this.\n * @return {DateTime}\n */\n setZone(zone, { keepLocalTime = false, keepCalendarTime = false } = {}) {\n zone = normalizeZone(zone, Settings.defaultZone);\n if (zone.equals(this.zone)) {\n return this;\n } else if (!zone.isValid) {\n return DateTime.invalid(unsupportedZone(zone));\n } else {\n let newTS = this.ts;\n if (keepLocalTime || keepCalendarTime) {\n const offsetGuess = this.o - zone.offset(this.ts);\n const asObj = this.toObject();\n [newTS] = objToTS(asObj, offsetGuess, zone);\n }\n return clone(this, { ts: newTS, zone });\n }\n }\n\n /**\n * \"Set\" the locale, numberingSystem, or outputCalendar. Returns a newly-constructed DateTime.\n * @param {Object} properties - the properties to set\n * @example DateTime.local(2017, 5, 25).reconfigure({ locale: 'en-GB' })\n * @return {DateTime}\n */\n reconfigure({ locale, numberingSystem, outputCalendar } = {}) {\n const loc = this.loc.clone({ locale, numberingSystem, outputCalendar });\n return clone(this, { loc });\n }\n\n /**\n * \"Set\" the locale. Returns a newly-constructed DateTime.\n * Just a convenient alias for reconfigure({ locale })\n * @example DateTime.local(2017, 5, 25).setLocale('en-GB')\n * @return {DateTime}\n */\n setLocale(locale) {\n return this.reconfigure({ locale });\n }\n\n /**\n * \"Set\" the values of specified units. Returns a newly-constructed DateTime.\n * You can only set units with this method; for \"setting\" metadata, see {@link reconfigure} and {@link setZone}.\n * @param {Object} values - a mapping of units to numbers\n * @example dt.set({ year: 2017 })\n * @example dt.set({ hour: 8, minute: 30 })\n * @example dt.set({ weekday: 5 })\n * @example dt.set({ year: 2005, ordinal: 234 })\n * @return {DateTime}\n */\n set(values) {\n if (!this.isValid) return this;\n\n const normalized = normalizeObject(values, normalizeUnit, []),\n settingWeekStuff =\n !isUndefined(normalized.weekYear) ||\n !isUndefined(normalized.weekNumber) ||\n !isUndefined(normalized.weekday);\n\n let mixed;\n if (settingWeekStuff) {\n mixed = weekToGregorian(Object.assign(gregorianToWeek(this.c), normalized));\n } else if (!isUndefined(normalized.ordinal)) {\n mixed = ordinalToGregorian(Object.assign(gregorianToOrdinal(this.c), normalized));\n } else {\n mixed = Object.assign(this.toObject(), normalized);\n\n // if we didn't set the day but we ended up on an overflow date,\n // use the last day of the right month\n if (isUndefined(normalized.day)) {\n mixed.day = Math.min(daysInMonth(mixed.year, mixed.month), mixed.day);\n }\n }\n\n const [ts, o] = objToTS(mixed, this.o, this.zone);\n return clone(this, { ts, o });\n }\n\n /**\n * Add a period of time to this DateTime and return the resulting DateTime\n *\n * Adding hours, minutes, seconds, or milliseconds increases the timestamp by the right number of milliseconds. Adding days, months, or years shifts the calendar, accounting for DSTs and leap years along the way. Thus, `dt.plus({ hours: 24 })` may result in a different time than `dt.plus({ days: 1 })` if there's a DST shift in between.\n * @param {Duration|Object|number} duration - The amount to add. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject()\n * @example DateTime.local().plus(123) //~> in 123 milliseconds\n * @example DateTime.local().plus({ minutes: 15 }) //~> in 15 minutes\n * @example DateTime.local().plus({ days: 1 }) //~> this time tomorrow\n * @example DateTime.local().plus({ days: -1 }) //~> this time yesterday\n * @example DateTime.local().plus({ hours: 3, minutes: 13 }) //~> in 3 hr, 13 min\n * @example DateTime.local().plus(Duration.fromObject({ hours: 3, minutes: 13 })) //~> in 3 hr, 13 min\n * @return {DateTime}\n */\n plus(duration) {\n if (!this.isValid) return this;\n const dur = friendlyDuration(duration);\n return clone(this, adjustTime(this, dur));\n }\n\n /**\n * Subtract a period of time to this DateTime and return the resulting DateTime\n * See {@link plus}\n * @param {Duration|Object|number} duration - The amount to subtract. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject()\n @return {DateTime}\n */\n minus(duration) {\n if (!this.isValid) return this;\n const dur = friendlyDuration(duration).negate();\n return clone(this, adjustTime(this, dur));\n }\n\n /**\n * \"Set\" this DateTime to the beginning of a unit of time.\n * @param {string} unit - The unit to go to the beginning of. Can be 'year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', or 'millisecond'.\n * @example DateTime.local(2014, 3, 3).startOf('month').toISODate(); //=> '2014-03-01'\n * @example DateTime.local(2014, 3, 3).startOf('year').toISODate(); //=> '2014-01-01'\n * @example DateTime.local(2014, 3, 3, 5, 30).startOf('day').toISOTime(); //=> '00:00.000-05:00'\n * @example DateTime.local(2014, 3, 3, 5, 30).startOf('hour').toISOTime(); //=> '05:00:00.000-05:00'\n * @return {DateTime}\n */\n startOf(unit) {\n if (!this.isValid) return this;\n const o = {},\n normalizedUnit = Duration.normalizeUnit(unit);\n switch (normalizedUnit) {\n case \"years\":\n o.month = 1;\n // falls through\n case \"quarters\":\n case \"months\":\n o.day = 1;\n // falls through\n case \"weeks\":\n case \"days\":\n o.hour = 0;\n // falls through\n case \"hours\":\n o.minute = 0;\n // falls through\n case \"minutes\":\n o.second = 0;\n // falls through\n case \"seconds\":\n o.millisecond = 0;\n break;\n case \"milliseconds\":\n break;\n // no default, invalid units throw in normalizeUnit()\n }\n\n if (normalizedUnit === \"weeks\") {\n o.weekday = 1;\n }\n\n if (normalizedUnit === \"quarters\") {\n const q = Math.ceil(this.month / 3);\n o.month = (q - 1) * 3 + 1;\n }\n\n return this.set(o);\n }\n\n /**\n * \"Set\" this DateTime to the end (i.e. the last millisecond) of a unit of time\n * @param {string} unit - The unit to go to the end of. Can be 'year', 'month', 'day', 'hour', 'minute', 'second', or 'millisecond'.\n * @example DateTime.local(2014, 3, 3).endOf('month').toISO(); //=> '2014-03-31T23:59:59.999-05:00'\n * @example DateTime.local(2014, 3, 3).endOf('year').toISO(); //=> '2014-12-31T23:59:59.999-05:00'\n * @example DateTime.local(2014, 3, 3, 5, 30).endOf('day').toISO(); //=> '2014-03-03T23:59:59.999-05:00'\n * @example DateTime.local(2014, 3, 3, 5, 30).endOf('hour').toISO(); //=> '2014-03-03T05:59:59.999-05:00'\n * @return {DateTime}\n */\n endOf(unit) {\n return this.isValid\n ? this.plus({ [unit]: 1 })\n .startOf(unit)\n .minus(1)\n : this;\n }\n\n // OUTPUT\n\n /**\n * Returns a string representation of this DateTime formatted according to the specified format string.\n * **You may not want this.** See {@link toLocaleString} for a more flexible formatting tool. For a table of tokens and their interpretations, see [here](https://moment.github.io/luxon/docs/manual/formatting.html#table-of-tokens).\n * Defaults to en-US if no locale has been specified, regardless of the system's locale.\n * @see https://moment.github.io/luxon/docs/manual/formatting.html#table-of-tokens\n * @param {string} fmt - the format string\n * @param {Object} opts - opts to override the configuration options\n * @example DateTime.local().toFormat('yyyy LLL dd') //=> '2017 Apr 22'\n * @example DateTime.local().setLocale('fr').toFormat('yyyy LLL dd') //=> '2017 avr. 22'\n * @example DateTime.local().toFormat('yyyy LLL dd', { locale: \"fr\" }) //=> '2017 avr. 22'\n * @example DateTime.local().toFormat(\"HH 'hours and' mm 'minutes'\") //=> '20 hours and 55 minutes'\n * @return {string}\n */\n toFormat(fmt, opts = {}) {\n return this.isValid\n ? Formatter.create(this.loc.redefaultToEN(opts)).formatDateTimeFromString(this, fmt)\n : INVALID;\n }\n\n /**\n * Returns a localized string representing this date. Accepts the same options as the Intl.DateTimeFormat constructor and any presets defined by Luxon, such as `DateTime.DATE_FULL` or `DateTime.TIME_SIMPLE`.\n * The exact behavior of this method is browser-specific, but in general it will return an appropriate representation\n * of the DateTime in the assigned locale.\n * Defaults to the system's locale if no locale has been specified\n * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat\n * @param opts {Object} - Intl.DateTimeFormat constructor options and configuration options\n * @example DateTime.local().toLocaleString(); //=> 4/20/2017\n * @example DateTime.local().setLocale('en-gb').toLocaleString(); //=> '20/04/2017'\n * @example DateTime.local().toLocaleString({ locale: 'en-gb' }); //=> '20/04/2017'\n * @example DateTime.local().toLocaleString(DateTime.DATE_FULL); //=> 'April 20, 2017'\n * @example DateTime.local().toLocaleString(DateTime.TIME_SIMPLE); //=> '11:32 AM'\n * @example DateTime.local().toLocaleString(DateTime.DATETIME_SHORT); //=> '4/20/2017, 11:32 AM'\n * @example DateTime.local().toLocaleString({ weekday: 'long', month: 'long', day: '2-digit' }); //=> 'Thursday, April 20'\n * @example DateTime.local().toLocaleString({ weekday: 'short', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }); //=> 'Thu, Apr 20, 11:27 AM'\n * @example DateTime.local().toLocaleString({ hour: '2-digit', minute: '2-digit', hour12: false }); //=> '11:32'\n * @return {string}\n */\n toLocaleString(opts = Formats.DATE_SHORT) {\n return this.isValid\n ? Formatter.create(this.loc.clone(opts), opts).formatDateTime(this)\n : INVALID;\n }\n\n /**\n * Returns an array of format \"parts\", i.e. individual tokens along with metadata. This is allows callers to post-process individual sections of the formatted output.\n * Defaults to the system's locale if no locale has been specified\n * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat/formatToParts\n * @param opts {Object} - Intl.DateTimeFormat constructor options, same as `toLocaleString`.\n * @example DateTime.local().toLocaleString(); //=> [\n * //=> { type: 'day', value: '25' },\n * //=> { type: 'literal', value: '/' },\n * //=> { type: 'month', value: '05' },\n * //=> { type: 'literal', value: '/' },\n * //=> { type: 'year', value: '1982' }\n * //=> ]\n */\n toLocaleParts(opts = {}) {\n return this.isValid\n ? Formatter.create(this.loc.clone(opts), opts).formatDateTimeParts(this)\n : [];\n }\n\n /**\n * Returns an ISO 8601-compliant string representation of this DateTime\n * @param {Object} opts - options\n * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0\n * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0\n * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'\n * @example DateTime.utc(1982, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'\n * @example DateTime.local().toISO() //=> '2017-04-22T20:47:05.335-04:00'\n * @example DateTime.local().toISO({ includeOffset: false }) //=> '2017-04-22T20:47:05.335'\n * @return {string}\n */\n toISO(opts = {}) {\n if (!this.isValid) {\n return null;\n }\n\n return `${this.toISODate()}T${this.toISOTime(opts)}`;\n }\n\n /**\n * Returns an ISO 8601-compliant string representation of this DateTime's date component\n * @example DateTime.utc(1982, 5, 25).toISODate() //=> '1982-05-25'\n * @return {string}\n */\n toISODate() {\n let format = \"yyyy-MM-dd\";\n if (this.year > 9999) {\n format = \"+\" + format;\n }\n\n return toTechFormat(this, format);\n }\n\n /**\n * Returns an ISO 8601-compliant string representation of this DateTime's week date\n * @example DateTime.utc(1982, 5, 25).toISOWeekDate() //=> '1982-W21-2'\n * @return {string}\n */\n toISOWeekDate() {\n return toTechFormat(this, \"kkkk-'W'WW-c\");\n }\n\n /**\n * Returns an ISO 8601-compliant string representation of this DateTime's time component\n * @param {Object} opts - options\n * @param {boolean} [opts.suppressMilliseconds=false] - exclude milliseconds from the format if they're 0\n * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0\n * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'\n * @example DateTime.utc().hour(7).minute(34).toISOTime() //=> '07:34:19.361Z'\n * @example DateTime.utc().hour(7).minute(34).toISOTime({ suppressSeconds: true }) //=> '07:34Z'\n * @return {string}\n */\n toISOTime({ suppressMilliseconds = false, suppressSeconds = false, includeOffset = true } = {}) {\n return toTechTimeFormat(this, {\n suppressSeconds,\n suppressMilliseconds,\n includeOffset\n });\n }\n\n /**\n * Returns an RFC 2822-compatible string representation of this DateTime, always in UTC\n * @example DateTime.utc(2014, 7, 13).toRFC2822() //=> 'Sun, 13 Jul 2014 00:00:00 +0000'\n * @example DateTime.local(2014, 7, 13).toRFC2822() //=> 'Sun, 13 Jul 2014 00:00:00 -0400'\n * @return {string}\n */\n toRFC2822() {\n return toTechFormat(this, \"EEE, dd LLL yyyy HH:mm:ss ZZZ\");\n }\n\n /**\n * Returns a string representation of this DateTime appropriate for use in HTTP headers.\n * Specifically, the string conforms to RFC 1123.\n * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3.1\n * @example DateTime.utc(2014, 7, 13).toHTTP() //=> 'Sun, 13 Jul 2014 00:00:00 GMT'\n * @example DateTime.utc(2014, 7, 13, 19).toHTTP() //=> 'Sun, 13 Jul 2014 19:00:00 GMT'\n * @return {string}\n */\n toHTTP() {\n return toTechFormat(this.toUTC(), \"EEE, dd LLL yyyy HH:mm:ss 'GMT'\");\n }\n\n /**\n * Returns a string representation of this DateTime appropriate for use in SQL Date\n * @example DateTime.utc(2014, 7, 13).toSQLDate() //=> '2014-07-13'\n * @return {string}\n */\n toSQLDate() {\n return toTechFormat(this, \"yyyy-MM-dd\");\n }\n\n /**\n * Returns a string representation of this DateTime appropriate for use in SQL Time\n * @param {Object} opts - options\n * @param {boolean} [opts.includeZone=false] - include the zone, such as 'America/New_York'. Overrides includeOffset.\n * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'\n * @example DateTime.utc().toSQL() //=> '05:15:16.345'\n * @example DateTime.local().toSQL() //=> '05:15:16.345 -04:00'\n * @example DateTime.local().toSQL({ includeOffset: false }) //=> '05:15:16.345'\n * @example DateTime.local().toSQL({ includeZone: false }) //=> '05:15:16.345 America/New_York'\n * @return {string}\n */\n toSQLTime({ includeOffset = true, includeZone = false } = {}) {\n return toTechTimeFormat(this, {\n includeOffset,\n includeZone,\n spaceZone: true\n });\n }\n\n /**\n * Returns a string representation of this DateTime appropriate for use in SQL DateTime\n * @param {Object} opts - options\n * @param {boolean} [opts.includeZone=false] - include the zone, such as 'America/New_York'. Overrides includeOffset.\n * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'\n * @example DateTime.utc(2014, 7, 13).toSQL() //=> '2014-07-13 00:00:00.000 Z'\n * @example DateTime.local(2014, 7, 13).toSQL() //=> '2014-07-13 00:00:00.000 -04:00'\n * @example DateTime.local(2014, 7, 13).toSQL({ includeOffset: false }) //=> '2014-07-13 00:00:00.000'\n * @example DateTime.local(2014, 7, 13).toSQL({ includeZone: true }) //=> '2014-07-13 00:00:00.000 America/New_York'\n * @return {string}\n */\n toSQL(opts = {}) {\n if (!this.isValid) {\n return null;\n }\n\n return `${this.toSQLDate()} ${this.toSQLTime(opts)}`;\n }\n\n /**\n * Returns a string representation of this DateTime appropriate for debugging\n * @return {string}\n */\n toString() {\n return this.isValid ? this.toISO() : INVALID;\n }\n\n /**\n * Returns the epoch milliseconds of this DateTime. Alias of {@link toMillis}\n * @return {number}\n */\n valueOf() {\n return this.toMillis();\n }\n\n /**\n * Returns the epoch milliseconds of this DateTime.\n * @return {number}\n */\n toMillis() {\n return this.isValid ? this.ts : NaN;\n }\n\n /**\n * Returns the epoch seconds of this DateTime.\n * @return {number}\n */\n toSeconds() {\n return this.isValid ? this.ts / 1000 : NaN;\n }\n\n /**\n * Returns an ISO 8601 representation of this DateTime appropriate for use in JSON.\n * @return {string}\n */\n toJSON() {\n return this.toISO();\n }\n\n /**\n * Returns a BSON serializable equivalent to this DateTime.\n * @return {Date}\n */\n toBSON() {\n return this.toJSDate();\n }\n\n /**\n * Returns a Javascript object with this DateTime's year, month, day, and so on.\n * @param opts - options for generating the object\n * @param {boolean} [opts.includeConfig=false] - include configuration attributes in the output\n * @example DateTime.local().toObject() //=> { year: 2017, month: 4, day: 22, hour: 20, minute: 49, second: 42, millisecond: 268 }\n * @return {Object}\n */\n toObject(opts = {}) {\n if (!this.isValid) return {};\n\n const base = Object.assign({}, this.c);\n\n if (opts.includeConfig) {\n base.outputCalendar = this.outputCalendar;\n base.numberingSystem = this.loc.numberingSystem;\n base.locale = this.loc.locale;\n }\n return base;\n }\n\n /**\n * Returns a Javascript Date equivalent to this DateTime.\n * @return {Date}\n */\n toJSDate() {\n return new Date(this.isValid ? this.ts : NaN);\n }\n\n // COMPARE\n\n /**\n * Return the difference between two DateTimes as a Duration.\n * @param {DateTime} otherDateTime - the DateTime to compare this one to\n * @param {string|string[]} [unit=['milliseconds']] - the unit or array of units (such as 'hours' or 'days') to include in the duration.\n * @param {Object} opts - options that affect the creation of the Duration\n * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use\n * @example\n * var i1 = DateTime.fromISO('1982-05-25T09:45'),\n * i2 = DateTime.fromISO('1983-10-14T10:30');\n * i2.diff(i1).toObject() //=> { milliseconds: 43807500000 }\n * i2.diff(i1, 'hours').toObject() //=> { hours: 12168.75 }\n * i2.diff(i1, ['months', 'days']).toObject() //=> { months: 16, days: 19.03125 }\n * i2.diff(i1, ['months', 'days', 'hours']).toObject() //=> { months: 16, days: 19, hours: 0.75 }\n * @return {Duration}\n */\n diff(otherDateTime, unit = \"milliseconds\", opts = {}) {\n if (!this.isValid || !otherDateTime.isValid) {\n return Duration.invalid(\n this.invalid || otherDateTime.invalid,\n \"created by diffing an invalid DateTime\"\n );\n }\n\n const durOpts = Object.assign(\n { locale: this.locale, numberingSystem: this.numberingSystem },\n opts\n );\n\n const units = maybeArray(unit).map(Duration.normalizeUnit),\n otherIsLater = otherDateTime.valueOf() > this.valueOf(),\n earlier = otherIsLater ? this : otherDateTime,\n later = otherIsLater ? otherDateTime : this,\n diffed = diff(earlier, later, units, durOpts);\n\n return otherIsLater ? diffed.negate() : diffed;\n }\n\n /**\n * Return the difference between this DateTime and right now.\n * See {@link diff}\n * @param {string|string[]} [unit=['milliseconds']] - the unit or units units (such as 'hours' or 'days') to include in the duration\n * @param {Object} opts - options that affect the creation of the Duration\n * @param {string} [opts.conversionAccuracy='casual'] - the conversion system to use\n * @return {Duration}\n */\n diffNow(unit = \"milliseconds\", opts = {}) {\n return this.diff(DateTime.local(), unit, opts);\n }\n\n /**\n * Return an Interval spanning between this DateTime and another DateTime\n * @param {DateTime} otherDateTime - the other end point of the Interval\n * @return {Interval}\n */\n until(otherDateTime) {\n return this.isValid ? Interval.fromDateTimes(this, otherDateTime) : this;\n }\n\n /**\n * Return whether this DateTime is in the same unit of time as another DateTime\n * @param {DateTime} otherDateTime - the other DateTime\n * @param {string} unit - the unit of time to check sameness on\n * @example DateTime.local().hasSame(otherDT, 'day'); //~> true if both the same calendar day\n * @return {boolean}\n */\n hasSame(otherDateTime, unit) {\n if (!this.isValid) return false;\n if (unit === \"millisecond\") {\n return this.valueOf() === otherDateTime.valueOf();\n } else {\n const inputMs = otherDateTime.valueOf();\n return this.startOf(unit) <= inputMs && inputMs <= this.endOf(unit);\n }\n }\n\n /**\n * Equality check\n * Two DateTimes are equal iff they represent the same millisecond, have the same zone and location, and are both valid.\n * To compare just the millisecond values, use `+dt1 === +dt2`.\n * @param {DateTime} other - the other DateTime\n * @return {boolean}\n */\n equals(other) {\n return (\n this.isValid &&\n other.isValid &&\n this.valueOf() === other.valueOf() &&\n this.zone.equals(other.zone) &&\n this.loc.equals(other.loc)\n );\n }\n\n /**\n * Returns a string representation of a this time relative to now, such as \"in two days\". Can only internationalize if your\n * platform supports Intl.RelativeTimeFormat. Rounds down by default.\n * @param {Object} options - options that affect the output\n * @param {DateTime} [options.base=DateTime.local()] - the DateTime to use as the basis to which this time is compared. Defaults to now.\n * @param {string} [options.style=\"long\"] - the style of units, must be \"long\", \"short\", or \"narrow\"\n * @param {string} options.unit - use a specific unit; if omitted, the method will pick the unit. Use one of \"years\", \"quarters\", \"months\", \"weeks\", \"days\", \"hours\", \"minutes\", or \"seconds\"\n * @param {boolean} [options.round=true] - whether to round the numbers in the output.\n * @param {boolean} [options.padding=0] - padding in milliseconds. This allows you to round up the result if it fits inside the threshold. Don't use in combination with {round: false} because the decimal output will include the padding.\n * @param {string} options.locale - override the locale of this DateTime\n * @param {string} options.numberingSystem - override the numberingSystem of this DateTime. The Intl system may choose not to honor this\n * @example DateTime.local().plus({ days: 1 }).toRelative() //=> \"in 1 day\"\n * @example DateTime.local().setLocale(\"es\").toRelative({ days: 1 }) //=> \"dentro de 1 día\"\n * @example DateTime.local().plus({ days: 1 }).toRelative({ locale: \"fr\" }) //=> \"dans 23 heures\"\n * @example DateTime.local().minus({ days: 2 }).toRelative() //=> \"2 days ago\"\n * @example DateTime.local().minus({ days: 2 }).toRelative({ unit: \"hours\" }) //=> \"48 hours ago\"\n * @example DateTime.local().minus({ hours: 36 }).toRelative({ round: false }) //=> \"1.5 days ago\"\n */\n toRelative(options = {}) {\n if (!this.isValid) return null;\n const base = options.base || DateTime.fromObject({ zone: this.zone }),\n padding = options.padding ? (this < base ? -options.padding : options.padding) : 0;\n return diffRelative(\n base,\n this.plus(padding),\n Object.assign(options, {\n numeric: \"always\",\n units: [\"years\", \"months\", \"days\", \"hours\", \"minutes\", \"seconds\"]\n })\n );\n }\n\n /**\n * Returns a string representation of this date relative to today, such as \"yesterday\" or \"next month\".\n * Only internationalizes on platforms that supports Intl.RelativeTimeFormat.\n * @param {Object} options - options that affect the output\n * @param {DateTime} [options.base=DateTime.local()] - the DateTime to use as the basis to which this time is compared. Defaults to now.\n * @param {string} options.locale - override the locale of this DateTime\n * @param {string} options.unit - use a specific unit; if omitted, the method will pick the unit. Use one of \"years\", \"quarters\", \"months\", \"weeks\", or \"days\"\n * @param {string} options.numberingSystem - override the numberingSystem of this DateTime. The Intl system may choose not to honor this\n * @example DateTime.local().plus({ days: 1 }).toRelativeCalendar() //=> \"tomorrow\"\n * @example DateTime.local().setLocale(\"es\").plus({ days: 1 }).toRelative() //=> \"\"mañana\"\n * @example DateTime.local().plus({ days: 1 }).toRelativeCalendar({ locale: \"fr\" }) //=> \"demain\"\n * @example DateTime.local().minus({ days: 2 }).toRelativeCalendar() //=> \"2 days ago\"\n */\n toRelativeCalendar(options = {}) {\n if (!this.isValid) return null;\n\n return diffRelative(\n options.base || DateTime.fromObject({ zone: this.zone }),\n this,\n Object.assign(options, {\n numeric: \"auto\",\n units: [\"years\", \"months\", \"days\"],\n calendary: true\n })\n );\n }\n\n /**\n * Return the min of several date times\n * @param {...DateTime} dateTimes - the DateTimes from which to choose the minimum\n * @return {DateTime} the min DateTime, or undefined if called with no argument\n */\n static min(...dateTimes) {\n if (!dateTimes.every(DateTime.isDateTime)) {\n throw new InvalidArgumentError(\"min requires all arguments be DateTimes\");\n }\n return bestBy(dateTimes, i => i.valueOf(), Math.min);\n }\n\n /**\n * Return the max of several date times\n * @param {...DateTime} dateTimes - the DateTimes from which to choose the maximum\n * @return {DateTime} the max DateTime, or undefined if called with no argument\n */\n static max(...dateTimes) {\n if (!dateTimes.every(DateTime.isDateTime)) {\n throw new InvalidArgumentError(\"max requires all arguments be DateTimes\");\n }\n return bestBy(dateTimes, i => i.valueOf(), Math.max);\n }\n\n // MISC\n\n /**\n * Explain how a string would be parsed by fromFormat()\n * @param {string} text - the string to parse\n * @param {string} fmt - the format the string is expected to be in (see description)\n * @param {Object} options - options taken by fromFormat()\n * @return {Object}\n */\n static fromFormatExplain(text, fmt, options = {}) {\n const { locale = null, numberingSystem = null } = options,\n localeToUse = Locale.fromOpts({\n locale,\n numberingSystem,\n defaultToEN: true\n });\n return explainFromTokens(localeToUse, text, fmt);\n }\n\n /**\n * @deprecated use fromFormatExplain instead\n */\n static fromStringExplain(text, fmt, options = {}) {\n return DateTime.fromFormatExplain(text, fmt, options);\n }\n\n // FORMAT PRESETS\n\n /**\n * {@link toLocaleString} format like 10/14/1983\n * @type {Object}\n */\n static get DATE_SHORT() {\n return Formats.DATE_SHORT;\n }\n\n /**\n * {@link toLocaleString} format like 'Oct 14, 1983'\n * @type {Object}\n */\n static get DATE_MED() {\n return Formats.DATE_MED;\n }\n\n /**\n * {@link toLocaleString} format like 'October 14, 1983'\n * @type {Object}\n */\n static get DATE_FULL() {\n return Formats.DATE_FULL;\n }\n\n /**\n * {@link toLocaleString} format like 'Tuesday, October 14, 1983'\n * @type {Object}\n */\n static get DATE_HUGE() {\n return Formats.DATE_HUGE;\n }\n\n /**\n * {@link toLocaleString} format like '09:30 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get TIME_SIMPLE() {\n return Formats.TIME_SIMPLE;\n }\n\n /**\n * {@link toLocaleString} format like '09:30:23 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get TIME_WITH_SECONDS() {\n return Formats.TIME_WITH_SECONDS;\n }\n\n /**\n * {@link toLocaleString} format like '09:30:23 AM EDT'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get TIME_WITH_SHORT_OFFSET() {\n return Formats.TIME_WITH_SHORT_OFFSET;\n }\n\n /**\n * {@link toLocaleString} format like '09:30:23 AM Eastern Daylight Time'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get TIME_WITH_LONG_OFFSET() {\n return Formats.TIME_WITH_LONG_OFFSET;\n }\n\n /**\n * {@link toLocaleString} format like '09:30', always 24-hour.\n * @type {Object}\n */\n static get TIME_24_SIMPLE() {\n return Formats.TIME_24_SIMPLE;\n }\n\n /**\n * {@link toLocaleString} format like '09:30:23', always 24-hour.\n * @type {Object}\n */\n static get TIME_24_WITH_SECONDS() {\n return Formats.TIME_24_WITH_SECONDS;\n }\n\n /**\n * {@link toLocaleString} format like '09:30:23 EDT', always 24-hour.\n * @type {Object}\n */\n static get TIME_24_WITH_SHORT_OFFSET() {\n return Formats.TIME_24_WITH_SHORT_OFFSET;\n }\n\n /**\n * {@link toLocaleString} format like '09:30:23 Eastern Daylight Time', always 24-hour.\n * @type {Object}\n */\n static get TIME_24_WITH_LONG_OFFSET() {\n return Formats.TIME_24_WITH_LONG_OFFSET;\n }\n\n /**\n * {@link toLocaleString} format like '10/14/1983, 9:30 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_SHORT() {\n return Formats.DATETIME_SHORT;\n }\n\n /**\n * {@link toLocaleString} format like '10/14/1983, 9:30:33 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_SHORT_WITH_SECONDS() {\n return Formats.DATETIME_SHORT_WITH_SECONDS;\n }\n\n /**\n * {@link toLocaleString} format like 'Oct 14, 1983, 9:30 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_MED() {\n return Formats.DATETIME_MED;\n }\n\n /**\n * {@link toLocaleString} format like 'Oct 14, 1983, 9:30:33 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_MED_WITH_SECONDS() {\n return Formats.DATETIME_MED_WITH_SECONDS;\n }\n\n /**\n * {@link toLocaleString} format like 'Fri, 14 Oct 1983, 9:30 AM'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_MED_WITH_WEEKDAY() {\n return Formats.DATETIME_MED_WITH_WEEKDAY;\n }\n\n /**\n * {@link toLocaleString} format like 'October 14, 1983, 9:30 AM EDT'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_FULL() {\n return Formats.DATETIME_FULL;\n }\n\n /**\n * {@link toLocaleString} format like 'October 14, 1983, 9:30:33 AM EDT'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_FULL_WITH_SECONDS() {\n return Formats.DATETIME_FULL_WITH_SECONDS;\n }\n\n /**\n * {@link toLocaleString} format like 'Friday, October 14, 1983, 9:30 AM Eastern Daylight Time'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_HUGE() {\n return Formats.DATETIME_HUGE;\n }\n\n /**\n * {@link toLocaleString} format like 'Friday, October 14, 1983, 9:30:33 AM Eastern Daylight Time'. Only 12-hour if the locale is.\n * @type {Object}\n */\n static get DATETIME_HUGE_WITH_SECONDS() {\n return Formats.DATETIME_HUGE_WITH_SECONDS;\n }\n}\n\n/**\n * @private\n */\nexport function friendlyDateTime(dateTimeish) {\n if (DateTime.isDateTime(dateTimeish)) {\n return dateTimeish;\n } else if (dateTimeish && dateTimeish.valueOf && isNumber(dateTimeish.valueOf())) {\n return DateTime.fromJSDate(dateTimeish);\n } else if (dateTimeish && typeof dateTimeish === \"object\") {\n return DateTime.fromObject(dateTimeish);\n } else {\n throw new InvalidArgumentError(\n `Unknown datetime argument: ${dateTimeish}, of type ${typeof dateTimeish}`\n );\n }\n}\n"],"names":["LuxonError","Error","InvalidDateTimeError","reason","toMessage","InvalidIntervalError","InvalidDurationError","ConflictingSpecificationError","InvalidUnitError","unit","InvalidArgumentError","ZoneIsAbstractError","isUndefined","o","isNumber","isInteger","isString","isDate","Object","prototype","toString","call","hasIntl","Intl","DateTimeFormat","e","hasFormatToParts","formatToParts","hasRelative","RelativeTimeFormat","maybeArray","thing","Array","isArray","bestBy","arr","by","compare","length","undefined","reduce","best","next","pair","pick","obj","keys","a","k","hasOwnProperty","prop","integerBetween","bottom","top","floorMod","x","n","Math","floor","padStart","input","repeat","slice","parseInteger","string","parseInt","parseMillis","fraction","f","parseFloat","roundTo","number","digits","towardZero","factor","rounder","trunc","round","isLeapYear","year","daysInYear","daysInMonth","month","modMonth","modYear","objToLocalTS","d","Date","UTC","day","hour","minute","second","millisecond","setUTCFullYear","getUTCFullYear","weeksInWeekYear","weekYear","p1","last","p2","untruncateYear","parseZoneInfo","ts","offsetFormat","locale","timeZone","date","intlOpts","hour12","modified","assign","timeZoneName","intl","parsed","find","m","type","toLowerCase","value","without","format","included","diffed","substring","trimmed","replace","signedOffset","offHourStr","offMinuteStr","offHour","offMin","offMinSigned","asNumber","numericValue","Number","isNaN","normalizeObject","normalizer","nonUnitKeys","normalized","u","indexOf","v","formatOffset","offset","hours","minutes","abs","sign","base","RangeError","timeObject","ianaRegex","s","l","d2","DATE_SHORT","DATE_MED","DATE_FULL","DATE_HUGE","weekday","TIME_SIMPLE","TIME_WITH_SECONDS","TIME_WITH_SHORT_OFFSET","TIME_WITH_LONG_OFFSET","TIME_24_SIMPLE","TIME_24_WITH_SECONDS","TIME_24_WITH_SHORT_OFFSET","TIME_24_WITH_LONG_OFFSET","DATETIME_SHORT","DATETIME_SHORT_WITH_SECONDS","DATETIME_MED","DATETIME_MED_WITH_SECONDS","DATETIME_MED_WITH_WEEKDAY","DATETIME_FULL","DATETIME_FULL_WITH_SECONDS","DATETIME_HUGE","DATETIME_HUGE_WITH_SECONDS","stringify","JSON","sort","monthsLong","monthsShort","monthsNarrow","months","weekdaysLong","weekdaysShort","weekdaysNarrow","weekdays","meridiems","erasLong","erasShort","erasNarrow","eras","meridiemForDateTime","dt","weekdayForDateTime","monthForDateTime","eraForDateTime","formatRelativeTime","count","numeric","narrow","units","years","quarters","weeks","days","seconds","lastable","isDay","isInPast","is","fmtValue","singular","lilUnits","fmtUnit","formatString","knownFormat","filtered","key","dateTimeHuge","Formats","Zone","offsetName","opts","equals","otherZone","singleton","LocalZone","getTimezoneOffset","resolvedOptions","matchingRegex","RegExp","source","dtfCache","makeDTF","zone","typeToPos","hackyOffset","dtf","formatted","exec","fMonth","fDay","fYear","fHour","fMinute","fSecond","partsOffset","filled","i","pos","ianaZoneCache","IANAZone","create","name","resetCache","isValidSpecifier","match","isValidZone","parseGMTOffset","specifier","zoneName","valid","asUTC","asTS","valueOf","FixedOffsetZone","instance","utcInstance","parseSpecifier","r","fixed","InvalidZone","NaN","normalizeZone","defaultZone","lowered","now","defaultLocale","defaultNumberingSystem","defaultOutputCalendar","throwOnInvalid","Settings","resetCaches","Locale","z","numberingSystem","outputCalendar","t","stringifyTokens","splits","tokenToString","token","literal","val","macroTokenToFormatOpts","D","DD","DDD","DDDD","tt","ttt","tttt","T","TT","TTT","TTTT","ff","fff","ffff","F","FF","FFF","FFFF","Formatter","parseFormat","fmt","current","currentFull","bracketed","c","charAt","push","formatOpts","loc","systemLoc","formatWithSystemDefault","redefaultToSystem","df","dtFormatter","formatDateTime","formatDateTimeParts","num","p","forceSimple","padTo","numberFormatter","formatDateTimeFromString","knownEnglish","listingMode","useDateTimeFormatter","extract","isOffsetFixed","allowZ","isValid","meridiem","English","standalone","maybeMacro","era","weekNumber","ordinal","quarter","formatDurationFromString","dur","tokenToField","lildur","mapped","get","tokens","realTokens","found","concat","collapsed","shiftTo","map","filter","intlDTCache","getCachedDTF","locString","intlNumCache","getCachendINF","inf","NumberFormat","intlRelCache","getCachendRTF","sysLocaleCache","systemLocale","computedSys","parseLocaleString","localeStr","uIndex","options","smaller","calendar","intlConfigString","mapMonths","ms","DateTime","utc","mapWeekdays","listStuff","defaultOK","englishFn","intlFn","mode","supportsFastNumbers","startsWith","PolyNumberFormatter","useGrouping","minimumIntegerDigits","PolyDateFormatter","universal","fromMillis","toJSDate","tokenFormat","PolyRelFormatter","isEnglish","style","rtf","fromOpts","defaultToEN","specifiedLocale","localeR","numberingSystemR","outputCalendarR","fromObject","numbering","parsedLocale","parsedNumberingSystem","parsedOutputCalendar","weekdaysCache","monthsCache","meridiemCache","eraCache","fastNumbersCached","hasFTP","isActuallyEn","hasNoWeirdness","clone","alts","getOwnPropertyNames","redefaultToEN","formatStr","field","results","matching","fastNumbers","relFormatter","other","combineRegexes","regexes","full","combineExtractors","extractors","ex","mergedVals","mergedZone","cursor","parse","patterns","regex","extractor","simpleParse","ret","offsetRegex","isoTimeBaseRegex","isoTimeRegex","isoTimeExtensionRegex","isoYmdRegex","isoWeekRegex","isoOrdinalRegex","extractISOWeekData","extractISOOrdinalData","sqlYmdRegex","sqlTimeRegex","sqlTimeExtensionRegex","int","fallback","extractISOYmd","item","extractISOTime","extractISOOffset","local","fullOffset","extractIANAZone","isoDuration","extractISODuration","yearStr","monthStr","weekStr","dayStr","hourStr","minuteStr","secondStr","millisecondsStr","milliseconds","obsOffsets","GMT","EDT","EST","CDT","CST","MDT","MST","PDT","PST","fromStrings","weekdayStr","result","rfc2822","extractRFC2822","obsOffset","milOffset","preprocessRFC2822","trim","rfc1123","rfc850","ascii","extractRFC1123Or850","extractASCII","isoYmdWithTimeExtensionRegex","isoWeekWithTimeExtensionRegex","isoOrdinalWithTimeExtensionRegex","isoTimeCombinedRegex","extractISOYmdTimeAndOffset","extractISOWeekTimeAndOffset","extractISOOrdinalDataAndTime","extractISOTimeAndOffset","parseISODate","parseRFC2822Date","parseHTTPDate","parseISODuration","sqlYmdWithTimeExtensionRegex","sqlTimeCombinedRegex","extractISOYmdTimeOffsetAndIANAZone","extractISOTimeOffsetAndIANAZone","parseSQL","Invalid","explanation","INVALID","lowOrderMatrix","casualMatrix","daysInYearAccurate","daysInMonthAccurate","accurateMatrix","orderedUnits","reverseUnits","reverse","clear","conf","values","conversionAccuracy","Duration","antiTrunc","ceil","convert","matrix","fromMap","fromUnit","toMap","toUnit","conv","raw","sameSign","added","normalizeValues","vals","previous","config","accurate","invalid","isLuxonDuration","normalizeUnit","fromISO","text","week","isDuration","toFormat","fmtOpts","toObject","includeConfig","toISO","toJSON","as","plus","duration","friendlyDuration","minus","negate","set","mixed","reconfigure","normalize","built","accumulated","lastUnit","own","ak","down","negated","durationish","validateStartEnd","start","end","Interval","isLuxonInterval","fromDateTimes","builtStart","friendlyDateTime","builtEnd","validateError","after","before","split","isInterval","toDuration","startOf","diff","hasSame","isEmpty","isAfter","dateTime","isBefore","contains","splitAt","dateTimes","sorted","splitBy","divideEqually","numberOfParts","overlaps","abutsStart","abutsEnd","engulfs","intersection","union","merge","intervals","b","sofar","final","xor","currentCount","ends","time","flattened","difference","dateFormat","separator","invalidReason","mapEndpoints","mapFn","Info","hasDST","proto","setZone","isValidIANAZone","monthsFormat","weekdaysFormat","features","intlTokens","zones","relative","dayDiff","earlier","later","utcDayStart","toUTC","keepLocalTime","highOrderDiffs","differs","lowestOrder","highWater","differ","delta","remainingMillis","lowerOrderUnits","numberingSystems","arab","arabext","bali","beng","deva","fullwide","gujr","hanidec","khmr","knda","laoo","limb","mlym","mong","mymr","orya","tamldec","telu","thai","tibt","latn","numberingSystemsUTF16","hanidecChars","parseDigits","str","code","charCodeAt","search","min","max","digitRegex","append","MISSING_FTP","intUnit","post","deser","fixListRegex","stripInsensitivities","oneOf","strings","startIndex","join","findIndex","groups","h","simple","escapeToken","unitForToken","one","two","three","four","six","oneOrTwo","oneToThree","oneToSix","oneToNine","twoToFour","fourToSix","unitate","partTypeStyleToTokenVal","short","long","dayperiod","tokenForPart","part","buildRegex","re","handlers","matches","all","matchIndex","dateTimeFromMatches","toField","Z","G","y","S","dummyDateTimeCache","getDummyDateTime","maybeExpandMacroToken","formatter","parts","includes","expandMacroTokens","explainFromTokens","disqualifyingUnit","regexString","rawMatches","parseFromTokens","nonLeapLadder","leapLadder","unitOutOfRange","dayOfWeek","js","getUTCDay","computeOrdinal","uncomputeOrdinal","table","month0","gregorianToWeek","gregObj","weekToGregorian","weekData","weekdayOfJan4","yearInDays","gregorianToOrdinal","gregData","ordinalToGregorian","ordinalData","hasInvalidWeekData","validYear","validWeek","validWeekday","hasInvalidOrdinalData","validOrdinal","hasInvalidGregorianData","validMonth","validDay","hasInvalidTimeData","validHour","validMinute","validSecond","validMillisecond","MAX_DATE","unsupportedZone","possiblyCachedWeekData","inst","old","fixOffset","localTS","tz","utcGuess","o2","o3","tsToObj","getUTCMonth","getUTCDate","getUTCHours","getUTCMinutes","getUTCSeconds","getUTCMilliseconds","objToTS","adjustTime","oPre","millisToAdd","parseDataToDateTime","parsedZone","interpretationZone","toTechFormat","toTechTimeFormat","suppressSeconds","suppressMilliseconds","includeOffset","includeZone","spaceZone","defaultUnitValues","defaultWeekUnitValues","defaultOrdinalUnitValues","orderedWeekUnits","orderedOrdinalUnits","weeknumber","weeksnumber","weeknumbers","weekyear","weekyears","quickDT","tsNow","offsetProvis","diffRelative","calendary","unchanged","_zone","isLuxonDateTime","fromJSDate","zoneToUse","fromSeconds","containsOrdinal","containsGregorYear","containsGregorMD","containsGregor","definiteWeekDef","useWeekData","defaultValues","objNow","foundFirst","higherOrderInvalid","gregorian","tsFinal","offsetFinal","fromRFC2822","fromHTTP","fromFormat","localeToUse","fromString","fromSQL","isDateTime","resolvedLocaleOpts","toLocal","keepCalendarTime","newTS","offsetGuess","asObj","setLocale","settingWeekStuff","normalizedUnit","q","endOf","toLocaleString","toLocaleParts","toISODate","toISOTime","toISOWeekDate","toRFC2822","toHTTP","toSQLDate","toSQLTime","toSQL","toMillis","toSeconds","toBSON","otherDateTime","durOpts","otherIsLater","diffNow","until","inputMs","toRelative","padding","toRelativeCalendar","every","fromFormatExplain","fromStringExplain","dateTimeish"],"mappings":"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"} \ No newline at end of file diff --git a/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js new file mode 100644 index 0000000000..d8eb382a5e --- /dev/null +++ b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js @@ -0,0 +1 @@ +var luxon=function(e){"use strict";function r(e,t){for(var n=0;n=r.length)break;a=r[o++]}else{if((o=r.next()).done)break;a=o.value}var u=a;u.literal?n+=u.val:n+=t(u.val)}return n}var Ge={D:Y,DD:G,DDD:$,DDDD:B,t:Q,tt:K,ttt:X,tttt:ee,T:te,TT:ne,TTT:re,TTTT:ie,f:oe,ff:ue,fff:le,ffff:de,F:ae,FF:se,FFF:fe,FFFF:he},$e=function(){function f(e,t){this.opts=t,this.loc=e,this.systemLoc=null}f.create=function(e,t){return void 0===t&&(t={}),new f(e,t)},f.parseFormat=function(e){for(var t=null,n="",r=!1,i=[],o=0;oKt.indexOf(c)&&tn(this.matrix,a,h,i,c)}else v(a[c])&&(o[c]=a[c])}for(var m in o)0!==o[m]&&(i[r]+=m===r?o[m]:o[m]/this.matrix[r][m]);return en(this,{values:i},!0).normalize()},e.negate=function(){if(!this.isValid)return this;for(var e={},t=0,n=Object.keys(this.values);te},e.isBefore=function(e){return!!this.isValid&&this.e<=e},e.contains=function(e){return!!this.isValid&&(this.s<=e&&this.e>e)},e.set=function(e){var t=void 0===e?{}:e,n=t.start,r=t.end;return this.isValid?f.fromDateTimes(n||this.s,r||this.e):this},e.splitAt=function(){var t=this;if(!this.isValid)return[];for(var e=arguments.length,n=new Array(e),r=0;r+this.e?this.e:s;o.push(f.fromDateTimes(a,c)),a=c,u+=1}return o},e.splitBy=function(e){var t=on(e);if(!this.isValid||!t.isValid||0===t.as("milliseconds"))return[];for(var n,r,i=this.s,o=[];i+this.e?this.e:n,o.push(f.fromDateTimes(i,r)),i=r;return o},e.divideEqually=function(e){return this.isValid?this.splitBy(this.length()/e).slice(0,e):[]},e.overlaps=function(e){return this.e>e.s&&this.s=e.e)},e.equals=function(e){return!(!this.isValid||!e.isValid)&&(this.s.equals(e.s)&&this.e.equals(e.e))},e.intersection=function(e){if(!this.isValid)return this;var t=this.s>e.s?this.s:e.s,n=this.ee.e?this.e:e.e;return f.fromDateTimes(t,n)},f.merge=function(e){var t=e.sort(function(e,t){return e.s-t.s}).reduce(function(e,t){var n=e[0],r=e[1];return r?r.overlaps(t)||r.abutsStart(t)?[n,r.union(t)]:[n.concat([r]),t]:[n,t]},[[],null]),n=t[0],r=t[1];return r&&n.push(r),n},f.xor=function(e){var t,n=null,r=0,i=[],o=e.map(function(e){return[{time:e.s,type:"s"},{time:e.e,type:"e"}]}),a=(t=Array.prototype).concat.apply(t,o).sort(function(e,t){return e.time-t.time}),u=Array.isArray(a),s=0;for(a=u?a:a[Symbol.iterator]();;){var c;if(u){if(s>=a.length)break;c=a[s++]}else{if((s=a.next()).done)break;c=s.value}var l=c;n=1===(r+="s"===l.type?1:-1)?l.time:(n&&+n!=+l.time&&i.push(f.fromDateTimes(n,l.time)),null)}return f.merge(i)},e.difference=function(){for(var t=this,e=arguments.length,n=new Array(e),r=0;rC(n)?(t=n+1,u=1):t=n,Object.assign({weekYear:t,weekNumber:u,weekday:a},H(e))}function Fn(e){var t,n=e.weekYear,r=e.weekNumber,i=e.weekday,o=In(n,1,4),a=L(n),u=7*r+i-o-3;u<1?u+=L(t=n-1):a=a.length)break;c=a[s++]}else{if((s=a.next()).done)break;c=s.value}var l=c,f=i(l);if(1<=Math.abs(f))return e(f,l)}return e(0,r.units[r.units.length-1])}var ir=function(){function T(e){var t=e.zone||Je.defaultZone,n=e.invalid||(Number.isNaN(e.ts)?new Jt("invalid input"):null)||(t.isValid?null:_n(t));this.ts=N(e.ts)?Je.now():e.ts;var r=null,i=null;if(!n)if(e.old&&e.old.ts===this.ts&&e.old.zone.equals(t)){var o=[e.old.c,e.old.o];r=o[0],i=o[1]}else r=Rn(this.ts,t.offset(this.ts)),r=(n=Number.isNaN(r.year)?new Jt("invalid input"):null)?null:r,i=n?null:t.offset(this.ts);this._zone=t,this.loc=e.loc||ot.create(),this.invalid=n,this.weekData=null,this.c=r,this.o=i,this.isLuxonDateTime=!0}T.local=function(e,t,n,r,i,o,a){return N(e)?new T({ts:Je.now()}):nr({year:e,month:t,day:n,hour:r,minute:i,second:o,millisecond:a},Je.defaultZone)},T.utc=function(e,t,n,r,i,o,a){return N(e)?new T({ts:Je.now(),zone:Ae.utcInstance}):nr({year:e,month:t,day:n,hour:r,minute:i,second:o,millisecond:a},Ae.utcInstance)},T.fromJSDate=function(e,t){void 0===t&&(t={});var n=function(e){return"[object Date]"===Object.prototype.toString.call(e)}(e)?e.valueOf():NaN;if(Number.isNaN(n))return T.invalid("invalid input");var r=_e(t.zone,Je.defaultZone);return r.isValid?new T({ts:n,zone:r,loc:ot.fromObject(t)}):T.invalid(_n(r))},T.fromMillis=function(e,t){if(void 0===t&&(t={}),v(e))return e<-864e13||864e13=v.length)break;w=v[p++]}else{if((p=v.next()).done)break;w=p.value}var k=w;N(i[k])?i[k]=y?d[k]:m[k]:y=!0}var b=(h?function(e){var t=D(e.weekYear),n=E(e.weekNumber,1,C(e.weekYear)),r=E(e.weekday,1,7);return t?n?!r&&En("weekday",e.weekday):En("week",e.week):En("weekYear",e.weekYear)}(i):o?function(e){var t=D(e.year),n=E(e.ordinal,1,L(e.year));return t?!n&&En("ordinal",e.ordinal):En("year",e.year)}(i):jn(i))||An(i);if(b)return T.invalid(b);var O=Wn(h?Fn(i):o?Zn(i):i,r,t),S=new T({ts:O[0],zone:t,o:O[1],loc:l});return i.weekday&&s&&e.weekday!==S.weekday?T.invalid("mismatched weekday","you can't specify both a weekday of "+i.weekday+" and a date of "+S.toISO()):S},T.fromISO=function(e,t){void 0===t&&(t={});var n=function(e){return st(e,[Ct,zt],[Zt,_t],[jt,qt],[At,Ht])}(e);return Jn(n[0],n[1],t,"ISO 8601",e)},T.fromRFC2822=function(e,t){void 0===t&&(t={});var n=function(e){return st(function(e){return e.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").trim()}(e),[Dt,Et])}(e);return Jn(n[0],n[1],t,"RFC 2822",e)},T.fromHTTP=function(e,t){void 0===t&&(t={});var n=function(e){return st(e,[It,xt],[Vt,xt],[Lt,Ft])}(e);return Jn(n[0],n[1],t,"HTTP",t)},T.fromFormat=function(e,t,n){if(void 0===n&&(n={}),N(e)||N(t))throw new h("fromFormat requires an input string and a format");var r=n,i=r.locale,o=void 0===i?null:i,a=r.numberingSystem,u=void 0===a?null:a,s=function(e,t,n){var r=Mn(e,t,n);return[r.result,r.zone,r.invalidReason]}(ot.fromOpts({locale:o,numberingSystem:u,defaultToEN:!0}),e,t),c=s[0],l=s[1],f=s[2];return f?T.invalid(f):Jn(c,l,n,"format "+t,e)},T.fromString=function(e,t,n){return void 0===n&&(n={}),T.fromFormat(e,t,n)},T.fromSQL=function(e,t){void 0===t&&(t={});var n=function(e){return st(e,[Ut,Wt],[Rt,Pt])}(e);return Jn(n[0],n[1],t,"SQL",e)},T.invalid=function(e,t){if(void 0===t&&(t=null),!e)throw new h("need to specify a reason the DateTime is invalid");var n=e instanceof Jt?e:new Jt(e,t);if(Je.throwOnInvalid)throw new c(n);return new T({invalid:n})},T.isDateTime=function(e){return e&&e.isLuxonDateTime||!1};var e=T.prototype;return e.get=function(e){return this[e]},e.resolvedLocaleOpts=function(e){void 0===e&&(e={});var t=$e.create(this.loc.clone(e),e).resolvedOptions(this);return{locale:t.locale,numberingSystem:t.numberingSystem,outputCalendar:t.calendar}},e.toUTC=function(e,t){return void 0===e&&(e=0),void 0===t&&(t={}),this.setZone(Ae.instance(e),t)},e.toLocal=function(){return this.setZone(Je.defaultZone)},e.setZone=function(e,t){var n=void 0===t?{}:t,r=n.keepLocalTime,i=void 0!==r&&r,o=n.keepCalendarTime,a=void 0!==o&&o;if((e=_e(e,Je.defaultZone)).equals(this.zone))return this;if(e.isValid){var u=this.ts;if(i||a){var s=this.o-e.offset(this.ts);u=Wn(this.toObject(),s,e)[0]}return Hn(this,{ts:u,zone:e})}return T.invalid(_n(e))},e.reconfigure=function(e){var t=void 0===e?{}:e,n=t.locale,r=t.numberingSystem,i=t.outputCalendar,o=this.loc.clone({locale:n,numberingSystem:r,outputCalendar:i});return Hn(this,{loc:o})},e.setLocale=function(e){return this.reconfigure({locale:e})},e.set=function(e){if(!this.isValid)return this;var t,n=_(e,tr,[]);!N(n.weekYear)||!N(n.weekNumber)||!N(n.weekday)?t=Fn(Object.assign(xn(this.c),n)):N(n.ordinal)?(t=Object.assign(this.toObject(),n),N(n.day)&&(t.day=Math.min(x(t.year,t.month),t.day))):t=Zn(Object.assign(Cn(this.c),n));var r=Wn(t,this.o,this.zone);return Hn(this,{ts:r[0],o:r[1]})},e.plus=function(e){return this.isValid?Hn(this,Pn(this,on(e))):this},e.minus=function(e){return this.isValid?Hn(this,Pn(this,on(e).negate())):this},e.startOf=function(e){if(!this.isValid)return this;var t={},n=rn.normalizeUnit(e);switch(n){case"years":t.month=1;case"quarters":case"months":t.day=1;case"weeks":case"days":t.hour=0;case"hours":t.minute=0;case"minutes":t.second=0;case"seconds":t.millisecond=0}if("weeks"===n&&(t.weekday=1),"quarters"===n){var r=Math.ceil(this.month/3);t.month=3*(r-1)+1}return this.set(t)},e.endOf=function(e){var t;return this.isValid?this.plus(((t={})[e]=1,t)).startOf(e).minus(1):this},e.toFormat=function(e,t){return void 0===t&&(t={}),this.isValid?$e.create(this.loc.redefaultToEN(t)).formatDateTimeFromString(this,e):zn},e.toLocaleString=function(e){return void 0===e&&(e=Y),this.isValid?$e.create(this.loc.clone(e),e).formatDateTime(this):zn},e.toLocaleParts=function(e){return void 0===e&&(e={}),this.isValid?$e.create(this.loc.clone(e),e).formatDateTimeParts(this):[]},e.toISO=function(e){return void 0===e&&(e={}),this.isValid?this.toISODate()+"T"+this.toISOTime(e):null},e.toISODate=function(){var e="yyyy-MM-dd";return 9999this.valueOf(),a=ln(o?this:e,o?e:this,i,r);return o?a.negate():a},e.diffNow=function(e,t){return void 0===e&&(e="milliseconds"),void 0===t&&(t={}),this.diff(T.local(),e,t)},e.until=function(e){return this.isValid?un.fromDateTimes(this,e):this},e.hasSame=function(e,t){if(!this.isValid)return!1;if("millisecond"===t)return this.valueOf()===e.valueOf();var n=e.valueOf();return this.startOf(t)<=n&&n<=this.endOf(t)},e.equals=function(e){return this.isValid&&e.isValid&&this.valueOf()===e.valueOf()&&this.zone.equals(e.zone)&&this.loc.equals(e.loc)},e.toRelative=function(e){if(void 0===e&&(e={}),!this.isValid)return null;var t=e.base||T.fromObject({zone:this.zone}),n=e.padding?thisthis.set({month:1}).offset||this.offset>this.set({month:5}).offset)}},{key:"isInLeapYear",get:function(){return V(this.year)}},{key:"daysInMonth",get:function(){return x(this.year,this.month)}},{key:"daysInYear",get:function(){return this.isValid?L(this.year):NaN}},{key:"weeksInWeekYear",get:function(){return this.isValid?C(this.weekYear):NaN}}],[{key:"DATE_SHORT",get:function(){return Y}},{key:"DATE_MED",get:function(){return G}},{key:"DATE_FULL",get:function(){return $}},{key:"DATE_HUGE",get:function(){return B}},{key:"TIME_SIMPLE",get:function(){return Q}},{key:"TIME_WITH_SECONDS",get:function(){return K}},{key:"TIME_WITH_SHORT_OFFSET",get:function(){return X}},{key:"TIME_WITH_LONG_OFFSET",get:function(){return ee}},{key:"TIME_24_SIMPLE",get:function(){return te}},{key:"TIME_24_WITH_SECONDS",get:function(){return ne}},{key:"TIME_24_WITH_SHORT_OFFSET",get:function(){return re}},{key:"TIME_24_WITH_LONG_OFFSET",get:function(){return ie}},{key:"DATETIME_SHORT",get:function(){return oe}},{key:"DATETIME_SHORT_WITH_SECONDS",get:function(){return ae}},{key:"DATETIME_MED",get:function(){return ue}},{key:"DATETIME_MED_WITH_SECONDS",get:function(){return se}},{key:"DATETIME_MED_WITH_WEEKDAY",get:function(){return ce}},{key:"DATETIME_FULL",get:function(){return le}},{key:"DATETIME_FULL_WITH_SECONDS",get:function(){return fe}},{key:"DATETIME_HUGE",get:function(){return de}},{key:"DATETIME_HUGE_WITH_SECONDS",get:function(){return he}}]),T}();function or(e){if(ir.isDateTime(e))return e;if(e&&e.valueOf&&v(e.valueOf()))return ir.fromJSDate(e);if(e&&"object"==typeof e)return ir.fromObject(e);throw new h("Unknown datetime argument: "+e+", of type "+typeof e)}return e.DateTime=ir,e.Duration=rn,e.FixedOffsetZone=Ae,e.IANAZone=Ze,e.Info=sn,e.Interval=un,e.InvalidZone=ze,e.LocalZone=Ve,e.Settings=Je,e.Zone=Ee,e}({}); \ No newline at end of file diff --git a/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js.map b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js.map new file mode 100644 index 0000000000..56f8308fb6 --- /dev/null +++ b/samples/BookStore/src/Acme.BookStore.Web/wwwroot/libs/luxon/luxon.min.js.map @@ -0,0 +1 @@ +{"version":3,"sources":["0"],"names":["luxon","exports","_defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","_createClass","Constructor","protoProps","staticProps","prototype","_inheritsLoose","subClass","superClass","create","constructor","__proto__","_getPrototypeOf","o","setPrototypeOf","getPrototypeOf","_setPrototypeOf","p","_construct","Parent","args","Class","Reflect","construct","sham","Proxy","Date","toString","call","e","isNativeReflectConstruct","a","push","apply","instance","Function","bind","arguments","_wrapNativeSuper","_cache","Map","undefined","fn","indexOf","_isNativeFunction","TypeError","has","get","set","Wrapper","this","value","LuxonError","_Error","Error","InvalidDateTimeError","_LuxonError","reason","toMessage","InvalidIntervalError","_LuxonError2","InvalidDurationError","_LuxonError3","ConflictingSpecificationError","_LuxonError4","InvalidUnitError","_LuxonError5","unit","InvalidArgumentError","_LuxonError6","ZoneIsAbstractError","_LuxonError7","isUndefined","isNumber","isInteger","hasIntl","Intl","DateTimeFormat","hasFormatToParts","formatToParts","hasRelative","RelativeTimeFormat","bestBy","arr","by","compare","reduce","best","next","pair","pick","obj","keys","k","hasOwnProperty","prop","integerBetween","thing","bottom","top","padStart","input","n","repeat","slice","parseInteger","string","parseInt","parseMillis","fraction","f","parseFloat","Math","floor","roundTo","number","digits","towardZero","factor","pow","trunc","round","isLeapYear","year","daysInYear","daysInMonth","month","modMonth","x","floorMod","objToLocalTS","d","UTC","day","hour","minute","second","millisecond","setUTCFullYear","getUTCFullYear","weeksInWeekYear","weekYear","p1","last","p2","untruncateYear","parseZoneInfo","ts","offsetFormat","locale","timeZone","date","intlOpts","hour12","modified","assign","timeZoneName","intl","parsed","find","m","type","toLowerCase","without","format","substring","replace","signedOffset","offHourStr","offMinuteStr","offHour","offMin","asNumber","numericValue","Number","isNaN","normalizeObject","normalizer","nonUnitKeys","normalized","u","v","formatOffset","offset","hours","minutes","abs","sign","base","RangeError","timeObject","ianaRegex","s","l","d2","DATE_SHORT","DATE_MED","DATE_FULL","DATE_HUGE","weekday","TIME_SIMPLE","TIME_WITH_SECONDS","TIME_WITH_SHORT_OFFSET","TIME_WITH_LONG_OFFSET","TIME_24_SIMPLE","TIME_24_WITH_SECONDS","TIME_24_WITH_SHORT_OFFSET","TIME_24_WITH_LONG_OFFSET","DATETIME_SHORT","DATETIME_SHORT_WITH_SECONDS","DATETIME_MED","DATETIME_MED_WITH_SECONDS","DATETIME_MED_WITH_WEEKDAY","DATETIME_FULL","DATETIME_FULL_WITH_SECONDS","DATETIME_HUGE","DATETIME_HUGE_WITH_SECONDS","stringify","JSON","sort","monthsLong","monthsShort","monthsNarrow","months","weekdaysLong","weekdaysShort","weekdaysNarrow","weekdays","meridiems","erasLong","erasShort","erasNarrow","eras","Zone","_proto","offsetName","opts","equals","otherZone","singleton","LocalZone","_Zone","_ref","getTimezoneOffset","resolvedOptions","matchingRegex","RegExp","source","dtfCache","typeToPos","ianaZoneCache","IANAZone","name","_this","zoneName","valid","isValidZone","resetCache","isValidSpecifier","match","zone","parseGMTOffset","specifier","dtf","makeDTF","_ref2","formatted","filled","_formatted$i","pos","partsOffset","exec","fMonth","fDay","hackyOffset","asUTC","asTS","valueOf","singleton$1","FixedOffsetZone","fixed","utcInstance","parseSpecifier","r","InvalidZone","NaN","normalizeZone","defaultZone","isString","lowered","now","defaultLocale","defaultNumberingSystem","defaultOutputCalendar","throwOnInvalid","Settings","resetCaches","Locale","z","numberingSystem","outputCalendar","t","stringifyTokens","splits","tokenToString","_iterator","_isArray","Array","isArray","_i","Symbol","iterator","done","token","literal","val","_macroTokenToFormatOpts","D","DD","DDD","DDDD","tt","ttt","tttt","T","TT","TTT","TTTT","ff","fff","ffff","F","FF","FFF","FFFF","Formatter","formatOpts","loc","systemLoc","parseFormat","fmt","current","currentFull","bracketed","c","charAt","macroTokenToFormatOpts","formatWithSystemDefault","dt","redefaultToSystem","dtFormatter","formatDateTime","formatDateTimeParts","num","forceSimple","padTo","numberFormatter","formatDateTimeFromString","extract","isOffsetFixed","allowZ","isValid","meridiem","knownEnglish","meridiemForDateTime","standalone","monthForDateTime","weekdayForDateTime","era","eraForDateTime","listingMode","useDateTimeFormatter","weekNumber","ordinal","quarter","maybeMacro","formatDurationFromString","dur","tokenToField","lildur","_this2","tokens","realTokens","found","concat","collapsed","shiftTo","map","filter","mapped","intlDTCache","getCachedDTF","locString","intlNumCache","intlRelCache","sysLocaleCache","listStuff","defaultOK","englishFn","intlFn","mode","PolyNumberFormatter","useGrouping","minimumIntegerDigits","inf","NumberFormat","getCachendINF","PolyDateFormatter","universal","DateTime","fromMillis","_proto2","toJSDate","tokenFormat","knownFormat","dateTimeHuge","formatString","PolyRelFormatter","isEnglish","style","rtf","getCachendRTF","_proto3","count","numeric","narrow","units","years","quarters","weeks","days","seconds","lastable","isDay","isInPast","is","fmtValue","singular","lilUnits","fmtUnit","formatRelativeTime","numbering","specifiedLocale","_parseLocaleString","localeStr","uIndex","options","smaller","_options","calendar","parseLocaleString","parsedLocale","parsedNumberingSystem","parsedOutputCalendar","intlConfigString","weekdaysCache","monthsCache","meridiemCache","eraCache","fastNumbersCached","fromOpts","defaultToEN","computedSys","systemLocale","fromObject","_temp","_proto4","hasFTP","isActuallyEn","hasNoWeirdness","clone","alts","getOwnPropertyNames","redefaultToEN","formatStr","ms","utc","mapMonths","mapWeekdays","_this3","_this4","field","matching","fastNumbers","relFormatter","startsWith","other","supportsFastNumbers","combineRegexes","_len","regexes","_key","full","combineExtractors","_len2","extractors","_key2","ex","mergedVals","mergedZone","cursor","_ex","parse","_len3","patterns","_key3","_patterns","_patterns$_i","regex","extractor","simpleParse","_len4","_key4","ret","offsetRegex","isoTimeBaseRegex","isoTimeRegex","isoTimeExtensionRegex","extractISOWeekData","extractISOOrdinalData","sqlTimeRegex","sqlTimeExtensionRegex","int","fallback","extractISOYmd","extractISOTime","extractISOOffset","local","fullOffset","extractIANAZone","isoDuration","extractISODuration","yearStr","monthStr","weekStr","dayStr","hourStr","minuteStr","secondStr","millisecondsStr","milliseconds","obsOffsets","GMT","EDT","EST","CDT","CST","MDT","MST","PDT","PST","fromStrings","weekdayStr","result","rfc2822","extractRFC2822","obsOffset","milOffset","rfc1123","rfc850","ascii","extractRFC1123Or850","extractASCII","isoYmdWithTimeExtensionRegex","isoWeekWithTimeExtensionRegex","isoOrdinalWithTimeExtensionRegex","isoTimeCombinedRegex","extractISOYmdTimeAndOffset","extractISOWeekTimeAndOffset","extractISOOrdinalDataAndTime","extractISOTimeAndOffset","sqlYmdWithTimeExtensionRegex","sqlTimeCombinedRegex","extractISOYmdTimeOffsetAndIANAZone","extractISOTimeOffsetAndIANAZone","Invalid","explanation","lowOrderMatrix","casualMatrix","daysInYearAccurate","daysInMonthAccurate","accurateMatrix","orderedUnits","reverseUnits","reverse","clear","conf","values","conversionAccuracy","Duration","convert","matrix","fromMap","fromUnit","toMap","toUnit","conv","raw","added","ceil","antiTrunc","normalizeValues","vals","previous","config","accurate","invalid","isLuxonDuration","normalizeUnit","fromISO","text","parseISODuration","week","isDuration","toFormat","fmtOpts","toObject","includeConfig","toISO","toJSON","as","plus","duration","friendlyDuration","_orderedUnits","minus","negate","reconfigure","normalize","lastUnit","built","accumulated","_i2","_orderedUnits2","own","ak","down","negated","_i3","_Object$keys","_i4","_orderedUnits3","durationish","INVALID$1","Interval","start","end","isLuxonInterval","fromDateTimes","builtStart","friendlyDateTime","builtEnd","validateError","validateStartEnd","after","before","_split","split","_dur","isInterval","toDuration","startOf","diff","hasSame","isEmpty","isAfter","dateTime","isBefore","contains","splitAt","dateTimes","sorted","results","splitBy","divideEqually","numberOfParts","overlaps","abutsStart","abutsEnd","engulfs","intersection","union","merge","intervals","_intervals$sort$reduc","b","item","sofar","final","xor","_Array$prototype","currentCount","ends","time","_ref3","difference","dateFormat","_temp2","_ref4$separator","separator","invalidReason","mapEndpoints","mapFn","Info","hasDST","proto","setZone","isValidIANAZone","_ref$locale","_ref$numberingSystem","_ref$outputCalendar","monthsFormat","_ref2$locale","_ref2$numberingSystem","_ref2$outputCalendar","_temp3","_ref3$locale","_ref3$numberingSystem","weekdaysFormat","_temp4","_ref4","_ref4$locale","_ref4$numberingSystem","_temp5","_ref5$locale","_temp6","_ref6$locale","features","intlTokens","zones","relative","dayDiff","earlier","later","utcDayStart","toUTC","keepLocalTime","_diff","_highOrderDiffs","lowestOrder","highWater","_differs","_differs$_i","differ","_cursor$plus","_cursor$plus2","delta","highOrderDiffs","remainingMillis","lowerOrderUnits","_cursor$plus3","_Duration$fromMillis","numberingSystems","arab","arabext","bali","beng","deva","fullwide","gujr","hanidec","khmr","knda","laoo","limb","mlym","mong","mymr","orya","tamldec","telu","thai","tibt","latn","numberingSystemsUTF16","hanidecChars","digitRegex","append","MISSING_FTP","intUnit","post","deser","str","code","charCodeAt","search","_numberingSystemsUTF","min","max","parseDigits","fixListRegex","stripInsensitivities","oneOf","strings","startIndex","join","findIndex","groups","simple","partTypeStyleToTokenVal","2-digit","short","long","dayperiod","dummyDateTimeCache","maybeExpandMacroToken","part","tokenForPart","includes","explainFromTokens","expandMacroTokens","escapeToken","_ref5","one","two","three","four","six","oneOrTwo","oneToThree","oneToSix","oneToNine","twoToFour","fourToSix","unitate","unitForToken","disqualifyingUnit","_buildRegex","buildRegex","regexString","handlers","_match","matches","all","matchIndex","h","rawMatches","_ref6","Z","G","y","S","toField","dateTimeFromMatches","nonLeapLadder","leapLadder","unitOutOfRange","dayOfWeek","js","getUTCDay","computeOrdinal","uncomputeOrdinal","table","month0","gregorianToWeek","gregObj","weekToGregorian","weekData","weekdayOfJan4","yearInDays","_uncomputeOrdinal","gregorianToOrdinal","gregData","ordinalToGregorian","ordinalData","_uncomputeOrdinal2","hasInvalidGregorianData","validYear","validMonth","validDay","hasInvalidTimeData","validHour","validMinute","validSecond","validMillisecond","INVALID$2","unsupportedZone","possiblyCachedWeekData","clone$1","inst","old","fixOffset","localTS","tz","utcGuess","o2","o3","tsToObj","getUTCMonth","getUTCDate","getUTCHours","getUTCMinutes","getUTCSeconds","getUTCMilliseconds","objToTS","adjustTime","oPre","millisToAdd","_fixOffset","parseDataToDateTime","parsedZone","interpretationZone","toTechFormat","toTechTimeFormat","_ref$suppressSeconds","suppressSeconds","_ref$suppressMillisec","suppressMilliseconds","includeOffset","_ref$includeZone","includeZone","_ref$spaceZone","spaceZone","defaultUnitValues","defaultWeekUnitValues","defaultOrdinalUnitValues","orderedUnits$1","orderedWeekUnits","orderedOrdinalUnits","weeknumber","weeksnumber","weeknumbers","weekyear","weekyears","quickDT","tsNow","_objToTS","diffRelative","calendary","_zone","isLuxonDateTime","fromJSDate","isDate","zoneToUse","fromSeconds","offsetProvis","containsOrdinal","containsGregorYear","containsGregorMD","containsGregor","definiteWeekDef","defaultValues","useWeekData","objNow","foundFirst","_iterator2","_isArray2","validWeek","validWeekday","hasInvalidWeekData","validOrdinal","hasInvalidOrdinalData","_objToTS2","_parseISODate","parseISODate","fromRFC2822","_parseRFC2822Date","trim","preprocessRFC2822","parseRFC2822Date","fromHTTP","_parseHTTPDate","parseHTTPDate","fromFormat","_opts","_opts$locale","_opts$numberingSystem","_parseFromTokens","_explainFromTokens","parseFromTokens","fromString","fromSQL","_parseSQL","parseSQL","isDateTime","resolvedLocaleOpts","_Formatter$create$res","toLocal","_ref5$keepLocalTime","_ref5$keepCalendarTim","keepCalendarTime","newTS","offsetGuess","setLocale","mixed","_objToTS4","normalizedUnit","q","endOf","_this$plus","toLocaleString","toLocaleParts","toISODate","toISOTime","toISOWeekDate","_ref7","_ref7$suppressMillise","_ref7$suppressSeconds","_ref7$includeOffset","toRFC2822","toHTTP","toSQLDate","toSQLTime","_ref8","_ref8$includeOffset","_ref8$includeZone","toSQL","toMillis","toSeconds","toBSON","otherDateTime","durOpts","maybeArray","otherIsLater","diffed","diffNow","until","inputMs","toRelative","padding","toRelativeCalendar","every","fromFormatExplain","_options$locale","_options$numberingSys","fromStringExplain","dateTimeish"],"mappings":"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","file":"build/global/luxon.js"} \ No newline at end of file From 1d06dace02b4ef7c9cf0b552e385175a852a4a31 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 14 Oct 2019 17:02:41 +0800 Subject: [PATCH 03/96] Replace BuildConfiguration with GetConfiguration. --- .../blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 +- .../BookManagementHttpApiHostModule.cs | 2 +- .../BookManagementIdentityServerModule.cs | 2 +- .../BookManagementWebUnifiedModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameWebUnifiedModule.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 7a7ecc9046..93a6c27b75 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -59,7 +59,7 @@ namespace Volo.BloggingTestApp public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 9a29e4e98f..65a0898db9 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -40,7 +40,7 @@ namespace Acme.BookStore.BookManagement public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs index dc71ba4059..25521793a2 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs @@ -64,7 +64,7 @@ namespace Acme.BookStore.BookManagement public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs index 31a3162acc..c84f9ab22f 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs @@ -59,7 +59,7 @@ namespace Acme.BookStore.BookManagement public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 2d0190b60d..aa1c73d7b8 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -39,7 +39,7 @@ namespace MyCompanyName.MyProjectName public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 397afc38c3..5e191af70e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -64,7 +64,7 @@ namespace MyCompanyName.MyProjectName public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index ccfc845eaf..fda17d8304 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -58,7 +58,7 @@ namespace MyCompanyName.MyProjectName public override void ConfigureServices(ServiceConfigurationContext context) { var hostingEnvironment = context.Services.GetHostingEnvironment(); - var configuration = context.Services.BuildConfiguration(); + var configuration = context.Services.GetConfiguration(); Configure(options => { From a9ffe66032cd9c3d5a24c06c47b9fdd3d59e01ca Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Mon, 14 Oct 2019 22:44:22 +0300 Subject: [PATCH 04/96] closes #1900 Implementation of IDistributedCache --- .../Volo/Abp/Caching/AbpCachingModule.cs | 1 + .../Volo/Abp/Caching/DistributedCache.cs | 323 ++++++++++++++++++ .../Volo/Abp/Caching/IDistributedCache.cs | 144 ++++++++ .../Abp/Caching/DistributedCache_Tests.cs | 145 ++++++++ .../Volo/Abp/Caching/PersonCacheItem.cs | 7 + 5 files changed, 620 insertions(+) diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs index 48d55cc0d5..0502cd8d81 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs @@ -21,6 +21,7 @@ namespace Volo.Abp.Caching context.Services.AddDistributedMemoryCache(); context.Services.AddSingleton(typeof(IDistributedCache<>), typeof(DistributedCache<>)); + context.Services.AddSingleton(typeof(IDistributedCache<,>), typeof(DistributedCache<,>)); context.Services.Configure(cacheOptions => { diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs index caa51aeac1..654e60f323 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs @@ -439,4 +439,327 @@ namespace Volo.Abp.Caching DefaultCacheOptions = GetDefaultCacheEntryOptions(); } } + /// + /// Represents a distributed cache of type. + /// Uses a generic cache key type of type. + /// + /// The type of cache item being cached. + /// The type of cache key being used. + public class DistributedCache : IDistributedCache + where TCacheItem : class + { + public ILogger> Logger { get; set; } + + protected string CacheName { get; set; } + + protected bool IgnoreMultiTenancy { get; set; } + + protected IDistributedCache Cache { get; } + + protected ICancellationTokenProvider CancellationTokenProvider { get; } + + protected IDistributedCacheSerializer Serializer { get; } + + protected ICurrentTenant CurrentTenant { get; } + + protected SemaphoreSlim SyncSemaphore { get; } + + protected DistributedCacheEntryOptions DefaultCacheOptions; + + private readonly CacheOptions _cacheOption; + + private readonly DistributedCacheOptions _distributedCacheOption; + + public DistributedCache( + IOptions cacheOption, + IOptions distributedCacheOption, + IDistributedCache cache, + ICancellationTokenProvider cancellationTokenProvider, + IDistributedCacheSerializer serializer, + ICurrentTenant currentTenant) + { + _distributedCacheOption = distributedCacheOption.Value; + _cacheOption = cacheOption.Value; + Cache = cache; + CancellationTokenProvider = cancellationTokenProvider; + Logger = NullLogger>.Instance; + Serializer = serializer; + CurrentTenant = currentTenant; + + SyncSemaphore = new SemaphoreSlim(1, 1); + + SetDefaultOptions(); + } + protected virtual string NormalizeKey(string key) + { + var normalizedKey = "c:" + CacheName + ",k:" + _cacheOption.KeyPrefix + key; + + if (!IgnoreMultiTenancy && CurrentTenant.Id.HasValue) + { + normalizedKey = "t:" + CurrentTenant.Id.Value + "," + normalizedKey; + } + + return normalizedKey; + } + + protected virtual DistributedCacheEntryOptions GetDefaultCacheEntryOptions() + { + foreach (var configure in _cacheOption.CacheConfigurators) + { + var options = configure.Invoke(CacheName); + if (options != null) + { + return options; + } + } + return _cacheOption.GlobalCacheEntryOptions; + } + + protected virtual void SetDefaultOptions() + { + CacheName = CacheNameAttribute.GetCacheName(typeof(TCacheItem)); + + //IgnoreMultiTenancy + IgnoreMultiTenancy = typeof(TCacheItem).IsDefined(typeof(IgnoreMultiTenancyAttribute), true); + + //Configure default cache entry options + DefaultCacheOptions = GetDefaultCacheEntryOptions(); + } + public virtual TCacheItem Get(TCacheKey key, bool? hideErrors = null) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + byte[] cachedBytes; + + try + { + cachedBytes = Cache.Get(NormalizeKey(key?.ToString())); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return null; + } + + throw; + } + + if (cachedBytes == null) + { + return null; + } + + return Serializer.Deserialize(cachedBytes); + } + + public virtual async Task GetAsync(TCacheKey key, bool? hideErrors = null, CancellationToken token = default) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + byte[] cachedBytes; + + try + { + cachedBytes = await Cache.GetAsync( + NormalizeKey(key.ToString()), + CancellationTokenProvider.FallbackToProvider(token) + ); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return null; + } + + throw; + } + + if (cachedBytes == null) + { + return null; + } + + return Serializer.Deserialize(cachedBytes); + } + + public virtual TCacheItem GetOrAdd(TCacheKey key, Func factory, Func optionsFactory = null, bool? hideErrors = null) + { + var value = Get(key, hideErrors); + if (value != null) + { + return value; + } + + using (SyncSemaphore.Lock()) + { + value = Get(key, hideErrors); + if (value != null) + { + return value; + } + + value = factory(); + Set(key, value, optionsFactory?.Invoke(), hideErrors); + } + + return value; + } + + public virtual async Task GetOrAddAsync(TCacheKey key, Func> factory, Func optionsFactory = null, bool? hideErrors = null, CancellationToken token = default) + { + token = CancellationTokenProvider.FallbackToProvider(token); + var value = await GetAsync(key, hideErrors, token); + if (value != null) + { + return value; + } + + using (await SyncSemaphore.LockAsync(token)) + { + value = await GetAsync(key, hideErrors, token); + if (value != null) + { + return value; + } + + value = await factory(); + await SetAsync(key, value, optionsFactory?.Invoke(), hideErrors, token); + } + + return value; + } + + public virtual void Set(TCacheKey key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + try + { + Cache.Set( + NormalizeKey(key.ToString()), + Serializer.Serialize(value), + options ?? DefaultCacheOptions + ); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return; + } + + throw; + } + } + + public virtual async Task SetAsync(TCacheKey key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null, CancellationToken token = default) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + try + { + await Cache.SetAsync( + NormalizeKey(key.ToString()), + Serializer.Serialize(value), + options ?? DefaultCacheOptions, + CancellationTokenProvider.FallbackToProvider(token) + ); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return; + } + + throw; + } + } + + public virtual void Refresh(TCacheKey key, bool? hideErrors = null) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + try + { + Cache.Refresh(NormalizeKey(key.ToString())); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return; + } + + throw; + } + } + + public virtual async Task RefreshAsync(TCacheKey key, bool? hideErrors = null, CancellationToken token = default) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + try + { + await Cache.RefreshAsync(NormalizeKey(key.ToString()), CancellationTokenProvider.FallbackToProvider(token)); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return; + } + + throw; + } + } + + public virtual void Remove(TCacheKey key, bool? hideErrors = null) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + try + { + Cache.Remove(NormalizeKey(key.ToString())); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + } + + throw; + } + } + + public virtual async Task RemoveAsync(TCacheKey key, bool? hideErrors = null, CancellationToken token = default) + { + hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; + + try + { + await Cache.RemoveAsync(NormalizeKey(key.ToString()), CancellationTokenProvider.FallbackToProvider(token)); + } + catch (Exception ex) + { + if (hideErrors == true) + { + Logger.LogException(ex, LogLevel.Warning); + return; + } + + throw; + } + } + + } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs index 23bd6f4cf2..82adeda726 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs @@ -148,4 +148,148 @@ namespace Volo.Abp.Caching CancellationToken token = default ); } + /// + /// Represents a distributed cache of type. + /// Uses a generic cache key type of type. + /// + /// The type of cache item being cached. + /// The type of cache key being used. + public interface IDistributedCache + where TCacheItem : class + { + /// + /// Gets a cache item with the given key. If no cache item is found for the given key then returns null. + /// + /// The key of cached item to be retrieved from the cache. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The cache item, or null. + TCacheItem Get( + TCacheKey key, + bool? hideErrors = null + ); + + /// + /// Gets a cache item with the given key. If no cache item is found for the given key then returns null. + /// + /// The key of cached item to be retrieved from the cache. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The for the task. + /// The cache item, or null. + Task GetAsync( + [NotNull] TCacheKey key, + bool? hideErrors = null, + CancellationToken token = default + ); + + /// + /// Gets or Adds a cache item with the given key. If no cache item is found for the given key then adds a cache item + /// provided by delegate and returns the provided cache item. + /// + /// The key of cached item to be retrieved from the cache. + /// The factory delegate is used to provide the cache item when no cache item is found for the given . + /// The cache options for the factory delegate. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The cache item. + TCacheItem GetOrAdd( + TCacheKey key, + Func factory, + Func optionsFactory = null, + bool? hideErrors = null + ); + + /// + /// Gets or Adds a cache item with the given key. If no cache item is found for the given key then adds a cache item + /// provided by delegate and returns the provided cache item. + /// + /// The key of cached item to be retrieved from the cache. + /// The factory delegate is used to provide the cache item when no cache item is found for the given . + /// The cache options for the factory delegate. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The for the task. + /// The cache item. + Task GetOrAddAsync( + [NotNull] TCacheKey key, + Func> factory, + Func optionsFactory = null, + bool? hideErrors = null, + CancellationToken token = default + ); + + /// + /// Sets the cache item value for the provided key. + /// + /// The key of cached item to be retrieved from the cache. + /// The cache item value to set in the cache. + /// The cache options for the value. + /// Indicates to throw or hide the exceptions for the distributed cache. + void Set( + TCacheKey key, + TCacheItem value, + DistributedCacheEntryOptions options = null, + bool? hideErrors = null + ); + + /// + /// Sets the cache item value for the provided key. + /// + /// The key of cached item to be retrieved from the cache. + /// The cache item value to set in the cache. + /// The cache options for the value. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The for the task. + /// The indicating that the operation is asynchronous. + Task SetAsync( + [NotNull] TCacheKey key, + [NotNull] TCacheItem value, + [CanBeNull] DistributedCacheEntryOptions options = null, + bool? hideErrors = null, + CancellationToken token = default + ); + + /// + /// Refreshes the cache value of the given key, and resets its sliding expiration timeout. + /// + /// The key of cached item to be retrieved from the cache. + /// Indicates to throw or hide the exceptions for the distributed cache. + void Refresh( + TCacheKey key, + bool? hideErrors = null + ); + + /// + /// Refreshes the cache value of the given key, and resets its sliding expiration timeout. + /// + /// The key of cached item to be retrieved from the cache. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The for the task. + /// The indicating that the operation is asynchronous. + Task RefreshAsync( + TCacheKey key, + bool? hideErrors = null, + CancellationToken token = default + ); + + /// + /// Removes the cache item for given key from cache. + /// + /// The key of cached item to be retrieved from the cache. + /// Indicates to throw or hide the exceptions for the distributed cache. + void Remove( + TCacheKey key, + bool? hideErrors = null + ); + + /// + /// Removes the cache item for given key from cache. + /// + /// The key of cached item to be retrieved from the cache. + /// Indicates to throw or hide the exceptions for the distributed cache. + /// The for the task. + /// The indicating that the operation is asynchronous. + Task RemoveAsync( + TCacheKey key, + bool? hideErrors = null, + CancellationToken token = default + ); + } } diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs index fc6b443893..b802b3e297 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs @@ -122,5 +122,150 @@ namespace Volo.Abp.Caching cacheItem1.ShouldNotBeNull(); } + + [Fact] + public async Task Should_Set_Get_And_Remove_Cache_Items_With_Integer_Type_CacheKey() + { + var personCache = GetRequiredService>(); + + var cacheKey = 42; + const string personName = "john nash"; + + //Get (not exists yet) + var cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldBeNull(); + + //Set + cacheItem = new PersonCacheItem(personName); + await personCache.SetAsync(cacheKey, cacheItem); + + //Get (it should be available now + cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldNotBeNull(); + cacheItem.Name.ShouldBe(personName); + + //Remove + await personCache.RemoveAsync(cacheKey); + + //Get (not exists since removed) + cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldBeNull(); + } + + [Fact] + public async Task GetOrAddAsync_With_Integer_Type_CacheKey() + { + var personCache = GetRequiredService>(); + + var cacheKey = 42; + const string personName = "john nash"; + + //Will execute the factory method to create the cache item + + bool factoryExecuted = false; + + var cacheItem = await personCache.GetOrAddAsync(cacheKey, + async () => + { + factoryExecuted = true; + return new PersonCacheItem(personName); + }); + + factoryExecuted.ShouldBeTrue(); + cacheItem.Name.ShouldBe(personName); + + //This time, it will not execute the factory + + factoryExecuted = false; + + cacheItem = await personCache.GetOrAddAsync(cacheKey, + async () => + { + factoryExecuted = true; + return new PersonCacheItem(personName); + }); + + factoryExecuted.ShouldBeFalse(); + cacheItem.Name.ShouldBe(personName); + } + + [Fact] + public async Task SameClassName_But_DiffNamespace_Should_Not_Use_Same_Cache_With_Integer_CacheKey() + { + var personCache = GetRequiredService>(); + var otherPersonCache = GetRequiredService>(); + + + var cacheKey = 42; + const string personName = "john nash"; + + //Get (not exists yet) + var cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldBeNull(); + + var cacheItem1 = await otherPersonCache.GetAsync(cacheKey); + cacheItem1.ShouldBeNull(); + + //Set + cacheItem = new PersonCacheItem(personName); + await personCache.SetAsync(cacheKey, cacheItem); + + //Get (it should be available now, but otherPersonCache not exists now. + cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldNotBeNull(); + cacheItem.Name.ShouldBe(personName); + + cacheItem1 = await otherPersonCache.GetAsync(cacheKey); + cacheItem1.ShouldBeNull(); + + //set other person cache + cacheItem1 = new Sail.Testing.Caching.PersonCacheItem(personName); + await otherPersonCache.SetAsync(cacheKey, cacheItem1); + + cacheItem1 = await otherPersonCache.GetAsync(cacheKey); + cacheItem1.ShouldNotBeNull(); + cacheItem1.Name.ShouldBe(personName); + + //Remove + await personCache.RemoveAsync(cacheKey); + + + //Get (not exists since removed) + cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldBeNull(); + + cacheItem1 = await otherPersonCache.GetAsync(cacheKey); + cacheItem1.ShouldNotBeNull(); + + } + + [Fact] + public async Task Should_Set_Get_And_Remove_Cache_Items_With_Object_Type_CacheKey() + { + var personCache = GetRequiredService>(); + + var cacheKey = new DummyObjectAsCacheKey { DummyData = "DummyData", DummyInt = 42 }; + const string personName = "john nash"; + + //Get (not exists yet) + var cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldBeNull(); + + //Set + cacheItem = new PersonCacheItem(personName); + await personCache.SetAsync(cacheKey, cacheItem); + + //Get (it should be available now + cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldNotBeNull(); + cacheItem.Name.ShouldBe(personName); + + //Remove + await personCache.RemoveAsync(cacheKey); + + //Get (not exists since removed) + cacheItem = await personCache.GetAsync(cacheKey); + cacheItem.ShouldBeNull(); + } } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/PersonCacheItem.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/PersonCacheItem.cs index b6c6f1dd0a..6b3d9c36df 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/PersonCacheItem.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/PersonCacheItem.cs @@ -17,7 +17,14 @@ namespace Volo.Abp.Caching Name = name; } } + + public class DummyObjectAsCacheKey + { + public string DummyData { get; set; } + public int DummyInt { get; set; } + } } + namespace Sail.Testing.Caching { [Serializable] From 204703f5f66307114a3b2587c2eb77c30e6965e8 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 15 Oct 2019 16:02:06 +0800 Subject: [PATCH 05/96] Enable Swagger UI Resolve #1849 --- .../BloggingTestAppModule.cs | 13 +++++++------ .../Volo.BloggingTestApp.csproj | 2 +- .../docs/app/VoloDocs.Web/VoloDocs.Web.csproj | 2 +- .../docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 3 ++- .../Acme.BookStore.HttpApi.Host.csproj | 2 +- .../BookStoreHttpApiHostModule.cs | 9 +++------ .../Controllers/HomeController.cs | 4 +--- .../Acme.BookStore.Web/Acme.BookStore.Web.csproj | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 9 +++------ ....BookStore.BookManagement.HttpApi.Host.csproj | 2 +- .../BookManagementHttpApiHostModule.cs | 16 ++++++++-------- .../Controllers/HomeController.cs | 5 +---- ...ookStore.BookManagement.IdentityServer.csproj | 2 +- .../BookManagementIdentityServerModule.cs | 14 +++++++------- ...Acme.BookStore.BookManagement.Web.Host.csproj | 2 +- .../BookManagementWebHostModule.cs | 14 +++++++------- ...e.BookStore.BookManagement.Web.Unified.csproj | 2 +- .../BookManagementWebUnifiedModule.cs | 14 +++++++------- .../Acme.BookStore.Web/Acme.BookStore.Web.csproj | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 13 +++++++------ .../DashboardDemo.Web/DashboardDemo.Web.csproj | 2 +- .../DashboardDemo.Web/DashboardDemoWebModule.cs | 14 +++++++------- .../BackendAdminApp.Host.csproj | 2 +- .../BackendAdminAppHostModule.cs | 13 +++++++------ .../BackendAdminAppGateway.Host.csproj | 2 +- .../BackendAdminAppGatewayHostModule.cs | 14 +++++++------- .../InternalGateway.Host.csproj | 2 +- .../InternalGatewayHostModule.cs | 14 +++++++------- .../PublicWebSiteGateway.Host.csproj | 2 +- .../PublicWebSiteGatewayHostModule.cs | 14 +++++++------- .../BloggingService.Host.csproj | 2 +- .../BloggingServiceHostModule.cs | 14 +++++++------- .../Controllers/HomeController.cs | 5 +---- .../Controllers/HomeController.cs | 5 +---- .../IdentityService.Host.csproj | 2 +- .../IdentityServiceHostModule.cs | 14 +++++++------- .../Controllers/HomeController.cs | 5 +---- .../ProductService.Host.csproj | 2 +- .../ProductServiceHostModule.cs | 14 +++++++------- .../Controllers/HomeController.cs | 4 +--- ...CompanyName.MyProjectName.HttpApi.Host.csproj | 2 +- .../MyProjectNameHttpApiHostModule.cs | 9 +++------ .../Controllers/HomeController.cs | 4 +--- ...Name.MyProjectName.HttpApi.HostWithIds.csproj | 2 +- .../MyProjectNameHttpApiHostModule.cs | 9 +++------ .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyProjectNameWebModule.cs | 9 +++------ .../MyCompanyName.MyProjectName.Web.csproj | 2 +- .../MyProjectNameWebModule.cs | 9 +++------ .../Controllers/HomeController.cs | 5 +---- ...CompanyName.MyProjectName.HttpApi.Host.csproj | 2 +- .../MyProjectNameHttpApiHostModule.cs | 14 +++++++------- ...mpanyName.MyProjectName.IdentityServer.csproj | 2 +- .../MyProjectNameIdentityServerModule.cs | 14 +++++++------- .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyProjectNameWebHostModule.cs | 14 +++++++------- ...yCompanyName.MyProjectName.Web.Unified.csproj | 2 +- .../MyProjectNameWebUnifiedModule.cs | 14 +++++++------- 58 files changed, 180 insertions(+), 215 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 7a7ecc9046..bd0bf1069f 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -99,7 +100,7 @@ namespace Volo.BloggingTestApp context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "Blogging API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Blogging API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -147,11 +148,11 @@ namespace Volo.BloggingTestApp app.UseRouting(); - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuthentication(); diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index a0712e66f1..4fc039fcc2 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index f7b0567f4c..f275081723 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -16,7 +16,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 0766d977c9..73ec94d76e 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -96,7 +97,7 @@ namespace VoloDocs.Web context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Docs API", Version = "v1" diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj index 60caedd837..33e9eabfb3 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Acme.BookStore.HttpApi.Host.csproj @@ -13,7 +13,7 @@ - + diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs index 1ab494026d..eff9b9b9fb 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting; using Acme.BookStore.MongoDB; using Acme.BookStore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -50,9 +51,7 @@ namespace Acme.BookStore ConfigureLocalization(); ConfigureVirtualFileSystem(context); ConfigureCors(context, configuration); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context); + ConfigureSwaggerServices(context); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -107,7 +106,7 @@ namespace Acme.BookStore context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "BookStore API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "BookStore API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); }); } @@ -166,13 +165,11 @@ namespace Acme.BookStore app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs index 98d3d54cbd..44534ce35e 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/Controllers/HomeController.cs @@ -7,9 +7,7 @@ namespace Acme.BookStore.Controllers { public ActionResult Index() { - //TODO: Enabled once Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - return Content("OK: Acme.BookStore.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 6ecfde3589..bb1ce35232 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -35,7 +35,7 @@ - + diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index 2b78cb9cab..b09d8d3bfe 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -11,6 +11,7 @@ using Acme.BookStore.EntityFrameworkCore; using Acme.BookStore.Localization; using Acme.BookStore.MultiTenancy; using Acme.BookStore.Web.Menus; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -78,9 +79,7 @@ namespace Acme.BookStore.Web ConfigureLocalizationServices(); ConfigureNavigationServices(); ConfigureAutoApiControllers(); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context.Services); + ConfigureSwaggerServices(context.Services); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -170,7 +169,7 @@ namespace Acme.BookStore.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookStore API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookStore API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -207,13 +206,11 @@ namespace Acme.BookStore.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj index 77d59c25ce..7353f8c4cc 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Acme.BookStore.BookManagement.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 9a29e4e98f..afe0ca7b3c 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Hosting; using Acme.BookStore.BookManagement.EntityFrameworkCore; using Acme.BookStore.BookManagement.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; @@ -66,7 +67,7 @@ namespace Acme.BookStore.BookManagement context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -131,13 +132,12 @@ namespace Acme.BookStore.BookManagement { app.UseMultiTenancy(); } - app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseAbpRequestLocalization(); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs index d19236cf69..d643ad277f 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace Acme.BookStore.BookManagement.Controllers { public ActionResult Index() { - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - - return Content("OK: Acme.BookStore.BookManagement.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj index f4fe52af5d..39eed22e92 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Acme.BookStore.BookManagement.IdentityServer.csproj @@ -10,7 +10,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs index dc71ba4059..8a1d18d634 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Acme.BookStore.BookManagement.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -74,7 +75,7 @@ namespace Acme.BookStore.BookManagement context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -147,12 +148,11 @@ namespace Acme.BookStore.BookManagement } app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj index 3966fbf009..b135162793 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/Acme.BookStore.BookManagement.Web.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index 7da9bf2cc8..39f25c5248 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -2,6 +2,7 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using System.IO; using Microsoft.AspNetCore.Authentication; @@ -167,7 +168,7 @@ namespace Acme.BookStore.BookManagement services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -221,12 +222,11 @@ namespace Acme.BookStore.BookManagement app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookManagement API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookManagement API"); + }); app.UseAuditing(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj index 133f92e897..36e3fe44b3 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/Acme.BookStore.BookManagement.Web.Unified.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs index 31a3162acc..9ad0a094df 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Hosting; using Acme.BookStore.BookManagement.EntityFrameworkCore; using Acme.BookStore.BookManagement.MultiTenancy; using Acme.BookStore.BookManagement.Web; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -81,7 +82,7 @@ namespace Acme.BookStore.BookManagement context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookManagement API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookManagement API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -125,12 +126,11 @@ namespace Acme.BookStore.BookManagement app.UseMultiTenancy(); } - //TODO: Enabled when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAbpRequestLocalization(); app.UseAuditing(); diff --git a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 5dab7d1cfe..e0b270f72a 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -25,7 +25,7 @@ - + diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 767b3ca138..91d7cb0d16 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -158,7 +159,7 @@ namespace Acme.BookStore.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "BookStore API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BookStore API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -197,11 +198,11 @@ namespace Acme.BookStore.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "BookStore API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj index 56a3fa2209..716a9fd147 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemo.Web.csproj @@ -33,7 +33,7 @@ - + diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index c599ee0ac4..3bee23d8e0 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -9,6 +9,7 @@ using DashboardDemo.EntityFrameworkCore; using DashboardDemo.Localization; using DashboardDemo.MultiTenancy; using DashboardDemo.Web.Menus; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -165,7 +166,7 @@ namespace DashboardDemo.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "DashboardDemo API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "DashboardDemo API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -198,12 +199,11 @@ namespace DashboardDemo.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //Swagger does not support ASP.NET Core 3.0 yet - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "DashboardDemo API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj index 96ff8bb1dc..71841d6b75 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminApp.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs index 150852d69c..13c4577cc0 100644 --- a/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs +++ b/samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Protocols.OpenIdConnect; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OAuth; @@ -77,7 +78,7 @@ namespace BackendAdminApp.Host context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "Backend Admin Application API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Backend Admin Application API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); }); @@ -100,11 +101,11 @@ namespace BackendAdminApp.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Backend Admin Application API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Backend Admin Application API"); + }); app.UseMvcWithDefaultRouteAndArea(); } } diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj index cc8cd37351..7b6557bdfa 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs index 8c9a26406e..45fe70e03f 100644 --- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs @@ -5,6 +5,7 @@ using Ocelot.DependencyInjection; using Ocelot.Middleware; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Autofac; @@ -63,7 +64,7 @@ namespace BackendAdminAppGateway.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info { Title = "BackendAdminApp Gateway API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "BackendAdminApp Gateway API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -93,12 +94,11 @@ namespace BackendAdminAppGateway.Host app.UseVirtualFiles(); app.UseRouting(); app.UseAuthentication(); - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "BackendAdminApp Gateway API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "BackendAdminApp Gateway API"); + }); app.MapWhen( ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj index ae9b1d5dd1..0871015c5e 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs index 687d2e26a9..1232852126 100644 --- a/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs @@ -5,6 +5,7 @@ using Ocelot.DependencyInjection; using Ocelot.Middleware; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Autofac; @@ -52,7 +53,7 @@ namespace InternalGateway.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info { Title = "Internal Gateway API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "Internal Gateway API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -82,12 +83,11 @@ namespace InternalGateway.Host app.UseVirtualFiles(); app.UseRouting(); app.UseAuthentication(); - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Internal Gateway API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Internal Gateway API"); + }); app.MapWhen( ctx => diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj index f9bc566169..66d934c076 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs index b17e6bdbe1..2513c16c00 100644 --- a/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs +++ b/samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs @@ -5,6 +5,7 @@ using Ocelot.DependencyInjection; using Ocelot.Middleware; using ProductManagement; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Autofac; @@ -50,7 +51,7 @@ namespace PublicWebSiteGateway.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info { Title = "PublicWebSite Gateway API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "PublicWebSite Gateway API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -80,12 +81,11 @@ namespace PublicWebSiteGateway.Host app.UseVirtualFiles(); app.UseRouting(); app.UseAuthentication(); - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "PublicWebSite Gateway API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "PublicWebSite Gateway API"); + }); app.MapWhen( ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") || diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj index 51f991da3f..657e3cc1e3 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs index c495ed5a26..1f80e0c605 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Auditing; @@ -68,7 +69,7 @@ namespace BloggingService.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info {Title = "Blogging Service API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "Blogging Service API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -113,12 +114,11 @@ namespace BloggingService.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Blogging Service API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Blogging Service API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs index 5aa69a1e9b..014cf76fc3 100644 --- a/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/BloggingService.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace BloggingService.Host.Controllers { public ActionResult Index() { - //TODO: Enable swagger UI once it supports asp.net core 3.x - //return Redirect("/swagger"); - - return Content("OK: BloggingService.Host is working..."); + return Redirect("/swagger"); } } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs index a2b841ab54..690dfb972e 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace IdentityService.Host.Controllers { public ActionResult Index() { - //TODO: Enable swagger UI once it supports asp.net core 3.x - //return Redirect("/swagger"); - - return Content("OK: IdentityService.Host is working..."); + return Redirect("/swagger"); } } } diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj index 684f1bd4f1..9c14f74469 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityService.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs index 3e5210dfb8..96899af0a0 100644 --- a/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/IdentityService.Host/IdentityServiceHostModule.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Auditing; @@ -55,7 +56,7 @@ namespace IdentityService.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info {Title = "Identity Service API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "Identity Service API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -95,12 +96,11 @@ namespace IdentityService.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Identity Service API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Identity Service API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs index 7830e5d6bf..8d28ce4295 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace ProductService.Host.Controllers { public ActionResult Index() { - //TODO: Enable swagger UI once it supports asp.net core 3.x - //return Redirect("/swagger"); - - return Content("OK: ProductService.Host is working..."); + return Redirect("/swagger"); } } } diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj index 80d2a33bd6..2c101fcfa6 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs index e88228feb2..8389067092 100644 --- a/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs +++ b/samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using ProductManagement; using ProductManagement.EntityFrameworkCore; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Auditing; @@ -57,7 +58,7 @@ namespace ProductService.Host context.Services.AddSwaggerGen(options => { - options.SwaggerDoc("v1", new Info {Title = "Product Service API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "Product Service API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -97,12 +98,11 @@ namespace ProductService.Host app.UseRouting(); app.UseAuthentication(); app.UseAbpRequestLocalization(); //TODO: localization? - //TODO: Enable swagger UI once it supports asp.net core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Product Service API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Product Service API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs index 71c6127f9e..66ab9f58d0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs @@ -7,9 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers { public ActionResult Index() { - //TODO: Enabled once Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - return Content("OK: MyCompanyName.MyProjectName.HttpApi.HostWithIds is running..."); + return Redirect("/swagger"); } } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index a0d90bf695..bf7f6c19cd 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -12,7 +12,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 1c6ab51509..e22551a315 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; @@ -48,9 +49,7 @@ namespace MyCompanyName.MyProjectName ConfigureVirtualFileSystem(context); ConfigureRedis(context, configuration, hostingEnvironment); ConfigureCors(context, configuration); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context); + ConfigureSwaggerServices(context); } private void ConfigureCache(IConfigurationRoot configuration) @@ -101,7 +100,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "MyProjectName API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); }); } @@ -175,13 +174,11 @@ namespace MyCompanyName.MyProjectName } app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs index 71c6127f9e..66ab9f58d0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/Controllers/HomeController.cs @@ -7,9 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers { public ActionResult Index() { - //TODO: Enabled once Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - return Content("OK: MyCompanyName.MyProjectName.HttpApi.HostWithIds is running..."); + return Redirect("/swagger"); } } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 3a566c6563..82b1b69666 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -12,7 +12,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index db8f6cf0a4..114d3daa2c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -50,9 +51,7 @@ namespace MyCompanyName.MyProjectName ConfigureLocalization(); ConfigureVirtualFileSystem(context); ConfigureCors(context, configuration); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context); + ConfigureSwaggerServices(context); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -107,7 +106,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info {Title = "MyProjectName API", Version = "v1"}); + options.SwaggerDoc("v1", new OpenApiInfo {Title = "MyProjectName API", Version = "v1"}); options.DocInclusionPredicate((docName, description) => true); }); } @@ -166,13 +165,11 @@ namespace MyCompanyName.MyProjectName app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index d8f91dfd0d..15ea71970a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -18,7 +18,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 4f5bf7dd44..11f6914baa 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -12,6 +12,7 @@ using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web.Menus; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.Authentication.OAuth; @@ -78,9 +79,7 @@ namespace MyCompanyName.MyProjectName.Web ConfigureNavigationServices(configuration); ConfigureSwaggerServices(context.Services); ConfigureMultiTenancy(); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context.Services); + ConfigureSwaggerServices(context.Services); } private void ConfigureCache(IConfigurationRoot configuration) @@ -182,7 +181,7 @@ namespace MyCompanyName.MyProjectName.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -236,13 +235,11 @@ namespace MyCompanyName.MyProjectName.Web app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 8c65e90c25..7182a9730e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -34,7 +34,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 25a59a3d07..5f26a74bf0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -11,6 +11,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web.Menus; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -78,9 +79,7 @@ namespace MyCompanyName.MyProjectName.Web ConfigureLocalizationServices(); ConfigureNavigationServices(); ConfigureAutoApiControllers(); - - //Disabled swagger since it does not support ASP.NET Core 3.0 yet! - //ConfigureSwaggerServices(context.Services); + ConfigureSwaggerServices(context.Services); } private void ConfigureUrls(IConfigurationRoot configuration) @@ -178,7 +177,7 @@ namespace MyCompanyName.MyProjectName.Web services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -215,13 +214,11 @@ namespace MyCompanyName.MyProjectName.Web app.UseIdentityServer(); app.UseAbpRequestLocalization(); - /* Disabled swagger since it does not support ASP.NET Core 3.0 yet! app.UseSwagger(); app.UseSwaggerUI(options => { options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); }); - */ app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs index 5752202a06..66ab9f58d0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/Controllers/HomeController.cs @@ -7,10 +7,7 @@ namespace MyCompanyName.MyProjectName.Controllers { public ActionResult Index() { - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //return Redirect("/swagger"); - - return Content("OK: MyCompanyName.MyProjectName.HttpApi.Host is running..."); + return Redirect("/swagger"); } } } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 6a2ee611da..b06102add4 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 2d0190b60d..49735a9d40 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.AspNetCore.MultiTenancy; @@ -65,7 +66,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -125,12 +126,11 @@ namespace MyCompanyName.MyProjectName app.UseMultiTenancy(); } app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index f0431dce74..e26ff78926 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 397afc38c3..ff1247c68b 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.MultiTenancy; using StackExchange.Redis; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -74,7 +75,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -147,12 +148,11 @@ namespace MyCompanyName.MyProjectName } app.UseIdentityServer(); app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAuditing(); app.UseMvcWithDefaultRouteAndArea(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 4a6578146d..71c7708ad6 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 5c1318e32b..03b19172ee 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -2,6 +2,7 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using System.IO; using Microsoft.AspNetCore.Authentication; @@ -176,7 +177,7 @@ namespace MyCompanyName.MyProjectName services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); } @@ -230,12 +231,11 @@ namespace MyCompanyName.MyProjectName app.UseAbpRequestLocalization(); - //TODO: Enable when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "MyProjectName API"); + }); app.UseAuditing(); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj index 3c597f160c..3820eddadf 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index ccfc845eaf..912c532e40 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Hosting; using MyCompanyName.MyProjectName.EntityFrameworkCore; using MyCompanyName.MyProjectName.MultiTenancy; using MyCompanyName.MyProjectName.Web; +using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; @@ -80,7 +81,7 @@ namespace MyCompanyName.MyProjectName context.Services.AddSwaggerGen( options => { - options.SwaggerDoc("v1", new Info { Title = "MyProjectName API", Version = "v1" }); + options.SwaggerDoc("v1", new OpenApiInfo { Title = "MyProjectName API", Version = "v1" }); options.DocInclusionPredicate((docName, description) => true); options.CustomSchemaIds(type => type.FullName); }); @@ -124,12 +125,11 @@ namespace MyCompanyName.MyProjectName app.UseMultiTenancy(); } - //TODO: Enabled when Swagger supports ASP.NET Core 3.x - //app.UseSwagger(); - //app.UseSwaggerUI(options => - //{ - // options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); - //}); + app.UseSwagger(); + app.UseSwaggerUI(options => + { + options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API"); + }); app.UseAbpRequestLocalization(); app.UseAuditing(); From 14ea3f2f097c8aae695745eb09da584f4a113170 Mon Sep 17 00:00:00 2001 From: gterdem Date: Tue, 15 Oct 2019 13:14:10 +0300 Subject: [PATCH 06/96] Implemented inheritance for DistributedCache and interface. Fixed issue with complex object ToString resulting same object name as CacheKey. --- .../Volo/Abp/Caching/DistributedCache.cs | 494 ++++-------------- .../Volo/Abp/Caching/IDistributedCache.cs | 135 +---- .../Abp/Caching/DistributedCache_Tests.cs | 42 ++ 3 files changed, 147 insertions(+), 524 deletions(-) diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs index 654e60f323..be8fde19f2 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Caching.Distributed; @@ -15,10 +16,36 @@ namespace Volo.Abp.Caching /// Represents a distributed cache of type. /// /// The type of cache item being cached. - public class DistributedCache : IDistributedCache + public class DistributedCache : DistributedCache, IDistributedCache where TCacheItem : class { - public ILogger> Logger { get; set; } + public DistributedCache( + IOptions cacheOption, + IOptions distributedCacheOption, + IDistributedCache cache, + ICancellationTokenProvider cancellationTokenProvider, + IDistributedCacheSerializer serializer, + ICurrentTenant currentTenant) : base( + cacheOption: cacheOption, + distributedCacheOption: distributedCacheOption, + cache: cache, + cancellationTokenProvider: cancellationTokenProvider, + serializer: serializer, + currentTenant: currentTenant) + { + } + + } + /// + /// Represents a distributed cache of type. + /// Uses a generic cache key type of type. + /// + /// The type of cache item being cached. + /// The type of cache key being used. + public class DistributedCache : IDistributedCache + where TCacheItem : class + { + public ILogger> Logger { get; set; } protected string CacheName { get; set; } @@ -52,7 +79,7 @@ namespace Volo.Abp.Caching _cacheOption = cacheOption.Value; Cache = cache; CancellationTokenProvider = cancellationTokenProvider; - Logger = NullLogger>.Instance; + Logger = NullLogger>.Instance; Serializer = serializer; CurrentTenant = currentTenant; @@ -60,7 +87,60 @@ namespace Volo.Abp.Caching SetDefaultOptions(); } + protected virtual string NormalizeKey(TCacheKey key) + { + Type type = key.GetType(); + string keyValue = key.ToString(); + + // If complex type of object, override the key value with property concatenation + if (!typeof(IComparable).IsAssignableFrom(type) || type.IsPrimitive || type.IsValueType) + { + var sb = new System.Text.StringBuilder(); + var properties = type.GetProperties().Where(prop => prop.CanRead && prop.CanWrite); + + foreach (var prop in properties) + { + var value = prop.GetValue(key, null); + if (value != null) + { + sb.Append(value.ToString()); + } + } + keyValue = sb.ToString(); + } + var normalizedKey = "c:" + CacheName + ",k:" + _cacheOption.KeyPrefix + keyValue; + + if (!IgnoreMultiTenancy && CurrentTenant.Id.HasValue) + { + normalizedKey = "t:" + CurrentTenant.Id.Value + "," + normalizedKey; + } + + return normalizedKey; + } + + protected virtual DistributedCacheEntryOptions GetDefaultCacheEntryOptions() + { + foreach (var configure in _cacheOption.CacheConfigurators) + { + var options = configure.Invoke(CacheName); + if (options != null) + { + return options; + } + } + return _cacheOption.GlobalCacheEntryOptions; + } + + protected virtual void SetDefaultOptions() + { + CacheName = CacheNameAttribute.GetCacheName(typeof(TCacheItem)); + + //IgnoreMultiTenancy + IgnoreMultiTenancy = typeof(TCacheItem).IsDefined(typeof(IgnoreMultiTenancyAttribute), true); + //Configure default cache entry options + DefaultCacheOptions = GetDefaultCacheEntryOptions(); + } /// /// Gets a cache item with the given key. If no cache item is found for the given key then returns null. /// @@ -68,7 +148,7 @@ namespace Volo.Abp.Caching /// Indicates to throw or hide the exceptions for the distributed cache. /// The cache item, or null. public virtual TCacheItem Get( - string key, + TCacheKey key, bool? hideErrors = null) { hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; @@ -106,7 +186,7 @@ namespace Volo.Abp.Caching /// The for the task. /// The cache item, or null. public virtual async Task GetAsync( - string key, + TCacheKey key, bool? hideErrors = null, CancellationToken token = default) { @@ -131,7 +211,7 @@ namespace Volo.Abp.Caching throw; } - + if (cachedBytes == null) { return null; @@ -139,7 +219,6 @@ namespace Volo.Abp.Caching return Serializer.Deserialize(cachedBytes); } - /// /// Gets or Adds a cache item with the given key. If no cache item is found for the given key then adds a cache item /// provided by delegate and returns the provided cache item. @@ -149,10 +228,10 @@ namespace Volo.Abp.Caching /// The cache options for the factory delegate. /// Indicates to throw or hide the exceptions for the distributed cache. /// The cache item. - public TCacheItem GetOrAdd( - string key, - Func factory, - Func optionsFactory = null, + public virtual TCacheItem GetOrAdd( + TCacheKey key, + Func factory, + Func optionsFactory = null, bool? hideErrors = null) { var value = Get(key, hideErrors); @@ -175,7 +254,6 @@ namespace Volo.Abp.Caching return value; } - /// /// Gets or Adds a cache item with the given key. If no cache item is found for the given key then adds a cache item /// provided by delegate and returns the provided cache item. @@ -186,11 +264,11 @@ namespace Volo.Abp.Caching /// Indicates to throw or hide the exceptions for the distributed cache. /// The for the task. /// The cache item. - public async Task GetOrAddAsync( - string key, - Func> factory, - Func optionsFactory = null, - bool? hideErrors = null, + public virtual async Task GetOrAddAsync( + TCacheKey key, + Func> factory, + Func optionsFactory = null, + bool? hideErrors = null, CancellationToken token = default) { token = CancellationTokenProvider.FallbackToProvider(token); @@ -214,7 +292,6 @@ namespace Volo.Abp.Caching return value; } - /// /// Sets the cache item value for the provided key. /// @@ -223,7 +300,7 @@ namespace Volo.Abp.Caching /// The cache options for the value. /// Indicates to throw or hide the exceptions for the distributed cache. public virtual void Set( - string key, + TCacheKey key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null) @@ -249,7 +326,6 @@ namespace Volo.Abp.Caching throw; } } - /// /// Sets the cache item value for the provided key. /// @@ -260,7 +336,7 @@ namespace Volo.Abp.Caching /// The for the task. /// The indicating that the operation is asynchronous. public virtual async Task SetAsync( - string key, + TCacheKey key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null, @@ -288,15 +364,14 @@ namespace Volo.Abp.Caching throw; } } - /// /// Refreshes the cache value of the given key, and resets its sliding expiration timeout. /// /// The key of cached item to be retrieved from the cache. /// Indicates to throw or hide the exceptions for the distributed cache. public virtual void Refresh( - string key, - bool? hideErrors = null) + TCacheKey key, bool? + hideErrors = null) { hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; @@ -315,7 +390,6 @@ namespace Volo.Abp.Caching throw; } } - /// /// Refreshes the cache value of the given key, and resets its sliding expiration timeout. /// @@ -324,7 +398,7 @@ namespace Volo.Abp.Caching /// The for the task. /// The indicating that the operation is asynchronous. public virtual async Task RefreshAsync( - string key, + TCacheKey key, bool? hideErrors = null, CancellationToken token = default) { @@ -345,15 +419,13 @@ namespace Volo.Abp.Caching throw; } } - - /// /// Removes the cache item for given key from cache. /// /// The key of cached item to be retrieved from the cache. /// Indicates to throw or hide the exceptions for the distributed cache. public virtual void Remove( - string key, + TCacheKey key, bool? hideErrors = null) { hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; @@ -372,7 +444,6 @@ namespace Volo.Abp.Caching throw; } } - /// /// Removes the cache item for given key from cache. /// @@ -381,7 +452,7 @@ namespace Volo.Abp.Caching /// The for the task. /// The indicating that the operation is asynchronous. public virtual async Task RemoveAsync( - string key, + TCacheKey key, bool? hideErrors = null, CancellationToken token = default) { @@ -402,364 +473,7 @@ namespace Volo.Abp.Caching throw; } } - - protected virtual string NormalizeKey(string key) - { - var normalizedKey = "c:" + CacheName + ",k:" + _cacheOption.KeyPrefix + key; - - if (!IgnoreMultiTenancy && CurrentTenant.Id.HasValue) - { - normalizedKey = "t:" + CurrentTenant.Id.Value + "," + normalizedKey; - } - - return normalizedKey; - } - - protected virtual DistributedCacheEntryOptions GetDefaultCacheEntryOptions() - { - foreach (var configure in _cacheOption.CacheConfigurators) - { - var options = configure.Invoke(CacheName); - if (options != null) - { - return options; - } - } - return _cacheOption.GlobalCacheEntryOptions; - } - - protected virtual void SetDefaultOptions() - { - CacheName = CacheNameAttribute.GetCacheName(typeof(TCacheItem)); - - //IgnoreMultiTenancy - IgnoreMultiTenancy = typeof(TCacheItem).IsDefined(typeof(IgnoreMultiTenancyAttribute), true); - - //Configure default cache entry options - DefaultCacheOptions = GetDefaultCacheEntryOptions(); - } - } - /// - /// Represents a distributed cache of type. - /// Uses a generic cache key type of type. - /// - /// The type of cache item being cached. - /// The type of cache key being used. - public class DistributedCache : IDistributedCache - where TCacheItem : class - { - public ILogger> Logger { get; set; } - - protected string CacheName { get; set; } - - protected bool IgnoreMultiTenancy { get; set; } - - protected IDistributedCache Cache { get; } - - protected ICancellationTokenProvider CancellationTokenProvider { get; } - - protected IDistributedCacheSerializer Serializer { get; } - - protected ICurrentTenant CurrentTenant { get; } - - protected SemaphoreSlim SyncSemaphore { get; } - - protected DistributedCacheEntryOptions DefaultCacheOptions; - - private readonly CacheOptions _cacheOption; - - private readonly DistributedCacheOptions _distributedCacheOption; - - public DistributedCache( - IOptions cacheOption, - IOptions distributedCacheOption, - IDistributedCache cache, - ICancellationTokenProvider cancellationTokenProvider, - IDistributedCacheSerializer serializer, - ICurrentTenant currentTenant) - { - _distributedCacheOption = distributedCacheOption.Value; - _cacheOption = cacheOption.Value; - Cache = cache; - CancellationTokenProvider = cancellationTokenProvider; - Logger = NullLogger>.Instance; - Serializer = serializer; - CurrentTenant = currentTenant; - - SyncSemaphore = new SemaphoreSlim(1, 1); - - SetDefaultOptions(); - } - protected virtual string NormalizeKey(string key) - { - var normalizedKey = "c:" + CacheName + ",k:" + _cacheOption.KeyPrefix + key; - - if (!IgnoreMultiTenancy && CurrentTenant.Id.HasValue) - { - normalizedKey = "t:" + CurrentTenant.Id.Value + "," + normalizedKey; - } - - return normalizedKey; - } - - protected virtual DistributedCacheEntryOptions GetDefaultCacheEntryOptions() - { - foreach (var configure in _cacheOption.CacheConfigurators) - { - var options = configure.Invoke(CacheName); - if (options != null) - { - return options; - } - } - return _cacheOption.GlobalCacheEntryOptions; - } - - protected virtual void SetDefaultOptions() - { - CacheName = CacheNameAttribute.GetCacheName(typeof(TCacheItem)); - - //IgnoreMultiTenancy - IgnoreMultiTenancy = typeof(TCacheItem).IsDefined(typeof(IgnoreMultiTenancyAttribute), true); - - //Configure default cache entry options - DefaultCacheOptions = GetDefaultCacheEntryOptions(); - } - public virtual TCacheItem Get(TCacheKey key, bool? hideErrors = null) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - byte[] cachedBytes; - - try - { - cachedBytes = Cache.Get(NormalizeKey(key?.ToString())); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return null; - } - - throw; - } - - if (cachedBytes == null) - { - return null; - } - - return Serializer.Deserialize(cachedBytes); - } - - public virtual async Task GetAsync(TCacheKey key, bool? hideErrors = null, CancellationToken token = default) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - byte[] cachedBytes; - - try - { - cachedBytes = await Cache.GetAsync( - NormalizeKey(key.ToString()), - CancellationTokenProvider.FallbackToProvider(token) - ); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return null; - } - - throw; - } - - if (cachedBytes == null) - { - return null; - } - - return Serializer.Deserialize(cachedBytes); - } - - public virtual TCacheItem GetOrAdd(TCacheKey key, Func factory, Func optionsFactory = null, bool? hideErrors = null) - { - var value = Get(key, hideErrors); - if (value != null) - { - return value; - } - - using (SyncSemaphore.Lock()) - { - value = Get(key, hideErrors); - if (value != null) - { - return value; - } - - value = factory(); - Set(key, value, optionsFactory?.Invoke(), hideErrors); - } - - return value; - } - - public virtual async Task GetOrAddAsync(TCacheKey key, Func> factory, Func optionsFactory = null, bool? hideErrors = null, CancellationToken token = default) - { - token = CancellationTokenProvider.FallbackToProvider(token); - var value = await GetAsync(key, hideErrors, token); - if (value != null) - { - return value; - } - - using (await SyncSemaphore.LockAsync(token)) - { - value = await GetAsync(key, hideErrors, token); - if (value != null) - { - return value; - } - - value = await factory(); - await SetAsync(key, value, optionsFactory?.Invoke(), hideErrors, token); - } - - return value; - } - - public virtual void Set(TCacheKey key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - try - { - Cache.Set( - NormalizeKey(key.ToString()), - Serializer.Serialize(value), - options ?? DefaultCacheOptions - ); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return; - } - - throw; - } - } - - public virtual async Task SetAsync(TCacheKey key, TCacheItem value, DistributedCacheEntryOptions options = null, bool? hideErrors = null, CancellationToken token = default) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - try - { - await Cache.SetAsync( - NormalizeKey(key.ToString()), - Serializer.Serialize(value), - options ?? DefaultCacheOptions, - CancellationTokenProvider.FallbackToProvider(token) - ); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return; - } - - throw; - } - } - - public virtual void Refresh(TCacheKey key, bool? hideErrors = null) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - try - { - Cache.Refresh(NormalizeKey(key.ToString())); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return; - } - - throw; - } - } - - public virtual async Task RefreshAsync(TCacheKey key, bool? hideErrors = null, CancellationToken token = default) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - try - { - await Cache.RefreshAsync(NormalizeKey(key.ToString()), CancellationTokenProvider.FallbackToProvider(token)); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return; - } - - throw; - } - } - - public virtual void Remove(TCacheKey key, bool? hideErrors = null) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - try - { - Cache.Remove(NormalizeKey(key.ToString())); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - } - - throw; - } - } - - public virtual async Task RemoveAsync(TCacheKey key, bool? hideErrors = null, CancellationToken token = default) - { - hideErrors = hideErrors ?? _distributedCacheOption.HideErrors; - - try - { - await Cache.RemoveAsync(NormalizeKey(key.ToString()), CancellationTokenProvider.FallbackToProvider(token)); - } - catch (Exception ex) - { - if (hideErrors == true) - { - Logger.LogException(ex, LogLevel.Warning); - return; - } - - throw; - } - } - + } + } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs index 82adeda726..163da05632 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/IDistributedCache.cs @@ -10,143 +10,10 @@ namespace Volo.Abp.Caching /// Represents a distributed cache of type. /// /// The type of cache item being cached. - public interface IDistributedCache + public interface IDistributedCache : IDistributedCache where TCacheItem : class { - /// - /// Gets a cache item with the given key. If no cache item is found for the given key then returns null. - /// - /// The key of cached item to be retrieved from the cache. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The cache item, or null. - TCacheItem Get( - string key, - bool? hideErrors = null - ); - - /// - /// Gets a cache item with the given key. If no cache item is found for the given key then returns null. - /// - /// The key of cached item to be retrieved from the cache. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The for the task. - /// The cache item, or null. - Task GetAsync( - [NotNull] string key, - bool? hideErrors = null, - CancellationToken token = default - ); - - /// - /// Gets or Adds a cache item with the given key. If no cache item is found for the given key then adds a cache item - /// provided by delegate and returns the provided cache item. - /// - /// The key of cached item to be retrieved from the cache. - /// The factory delegate is used to provide the cache item when no cache item is found for the given . - /// The cache options for the factory delegate. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The cache item. - TCacheItem GetOrAdd( - string key, - Func factory, - Func optionsFactory = null, - bool? hideErrors = null - ); - /// - /// Gets or Adds a cache item with the given key. If no cache item is found for the given key then adds a cache item - /// provided by delegate and returns the provided cache item. - /// - /// The key of cached item to be retrieved from the cache. - /// The factory delegate is used to provide the cache item when no cache item is found for the given . - /// The cache options for the factory delegate. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The for the task. - /// The cache item. - Task GetOrAddAsync( - [NotNull] string key, - Func> factory, - Func optionsFactory = null, - bool? hideErrors = null, - CancellationToken token = default - ); - - /// - /// Sets the cache item value for the provided key. - /// - /// The key of cached item to be retrieved from the cache. - /// The cache item value to set in the cache. - /// The cache options for the value. - /// Indicates to throw or hide the exceptions for the distributed cache. - void Set( - string key, - TCacheItem value, - DistributedCacheEntryOptions options = null, - bool? hideErrors = null - ); - - /// - /// Sets the cache item value for the provided key. - /// - /// The key of cached item to be retrieved from the cache. - /// The cache item value to set in the cache. - /// The cache options for the value. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The for the task. - /// The indicating that the operation is asynchronous. - Task SetAsync( - [NotNull] string key, - [NotNull] TCacheItem value, - [CanBeNull] DistributedCacheEntryOptions options = null, - bool? hideErrors = null, - CancellationToken token = default - ); - - /// - /// Refreshes the cache value of the given key, and resets its sliding expiration timeout. - /// - /// The key of cached item to be retrieved from the cache. - /// Indicates to throw or hide the exceptions for the distributed cache. - void Refresh( - string key, - bool? hideErrors = null - ); - - /// - /// Refreshes the cache value of the given key, and resets its sliding expiration timeout. - /// - /// The key of cached item to be retrieved from the cache. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The for the task. - /// The indicating that the operation is asynchronous. - Task RefreshAsync( - string key, - bool? hideErrors = null, - CancellationToken token = default - ); - - /// - /// Removes the cache item for given key from cache. - /// - /// The key of cached item to be retrieved from the cache. - /// Indicates to throw or hide the exceptions for the distributed cache. - void Remove( - string key, - bool? hideErrors = null - ); - - /// - /// Removes the cache item for given key from cache. - /// - /// The key of cached item to be retrieved from the cache. - /// Indicates to throw or hide the exceptions for the distributed cache. - /// The for the task. - /// The indicating that the operation is asynchronous. - Task RemoveAsync( - string key, - bool? hideErrors = null, - CancellationToken token = default - ); } /// /// Represents a distributed cache of type. diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs index b802b3e297..93788e0995 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs @@ -267,5 +267,47 @@ namespace Volo.Abp.Caching cacheItem = await personCache.GetAsync(cacheKey); cacheItem.ShouldBeNull(); } + + [Fact] + public async Task Should_Set_Get_And_Remove_Cache_Items_For_Same_Object_Type_With_Different_CacheKeys() + { + var personCache = GetRequiredService>(); + + var cache1Key = new DummyObjectAsCacheKey { DummyData = "DummyData", DummyInt = 42 }; + var cache2Key = new DummyObjectAsCacheKey { DummyData = "DummyData2", DummyInt = 24 }; + const string personName = "john nash"; + + //Get (not exists yet) + var cacheItem1 = await personCache.GetAsync(cache1Key); + var cacheItem2 = await personCache.GetAsync(cache2Key); + cacheItem1.ShouldBeNull(); + cacheItem2.ShouldBeNull(); + + //Set + cacheItem1 = new PersonCacheItem(personName); + cacheItem2 = new PersonCacheItem(personName); + await personCache.SetAsync(cache1Key, cacheItem1); + await personCache.SetAsync(cache2Key, cacheItem2); + + //Get (it should be available now + cacheItem1 = await personCache.GetAsync(cache1Key); + cacheItem1.ShouldNotBeNull(); + cacheItem1.Name.ShouldBe(personName); + + cacheItem2 = await personCache.GetAsync(cache2Key); + cacheItem2.ShouldNotBeNull(); + cacheItem2.Name.ShouldBe(personName); + + //Remove + await personCache.RemoveAsync(cache1Key); + await personCache.RemoveAsync(cache2Key); + + //Get (not exists since removed) + cacheItem1 = await personCache.GetAsync(cache1Key); + cacheItem1.ShouldBeNull(); + cacheItem2 = await personCache.GetAsync(cache2Key); + cacheItem2.ShouldBeNull(); + } + } } \ No newline at end of file From d3dc97d43c0a11ac49091e9ffd7191ce66e2ee62 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:02:03 +0300 Subject: [PATCH 07/96] ExceptionHttpStatusCodeOptions renamed to AbpExceptionHttpStatusCodeOptions --- ...tusCodeOptions.cs => AbpExceptionHttpStatusCodeOptions.cs} | 4 ++-- .../ExceptionHandling/DefaultHttpExceptionStatusCodeFinder.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/{ExceptionHttpStatusCodeOptions.cs => AbpExceptionHttpStatusCodeOptions.cs} (82%) diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/ExceptionHttpStatusCodeOptions.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHttpStatusCodeOptions.cs similarity index 82% rename from framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/ExceptionHttpStatusCodeOptions.cs rename to framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHttpStatusCodeOptions.cs index d8766219f8..03374e5a39 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/ExceptionHttpStatusCodeOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/AbpExceptionHttpStatusCodeOptions.cs @@ -3,11 +3,11 @@ using System.Net; namespace Volo.Abp.AspNetCore.ExceptionHandling { - public class ExceptionHttpStatusCodeOptions + public class AbpExceptionHttpStatusCodeOptions { public IDictionary ErrorCodeToHttpStatusCodeMappings { get; } - public ExceptionHttpStatusCodeOptions() + public AbpExceptionHttpStatusCodeOptions() { ErrorCodeToHttpStatusCodeMappings = new Dictionary(); } diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultHttpExceptionStatusCodeFinder.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultHttpExceptionStatusCodeFinder.cs index d9079fc347..cf49642459 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultHttpExceptionStatusCodeFinder.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultHttpExceptionStatusCodeFinder.cs @@ -12,10 +12,10 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling { public class DefaultHttpExceptionStatusCodeFinder : IHttpExceptionStatusCodeFinder, ITransientDependency { - protected ExceptionHttpStatusCodeOptions Options { get; } + protected AbpExceptionHttpStatusCodeOptions Options { get; } public DefaultHttpExceptionStatusCodeFinder( - IOptions options) + IOptions options) { Options = options.Value; } From b1e594d622e011a9219982138778d133784aea53 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:02:16 +0300 Subject: [PATCH 08/96] ConfigurationBuilderOptions to AbpConfigurationBuilderOptions --- .../AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs | 4 ++-- .../AbpAspNetCoreServiceCollectionExtensions.cs | 4 ++-- ...ionBuilderOptions.cs => AbpConfigurationBuilderOptions.cs} | 2 +- .../Microsoft/Extensions/Configuration/ConfigurationHelper.cs | 4 ++-- .../Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) rename framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/{ConfigurationBuilderOptions.cs => AbpConfigurationBuilderOptions.cs} (96%) diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs index 039e819b38..2b38af50f1 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Hosting/AbpHostingEnvironmentExtensions.cs @@ -7,9 +7,9 @@ namespace Microsoft.AspNetCore.Hosting { public static IConfigurationRoot BuildConfiguration( this IWebHostEnvironment env, - ConfigurationBuilderOptions options = null) + AbpConfigurationBuilderOptions options = null) { - options = options ?? new ConfigurationBuilderOptions(); + options = options ?? new AbpConfigurationBuilderOptions(); if (options.BasePath.IsNullOrEmpty()) { diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs index 9d754b8da4..ecb641df34 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs @@ -12,13 +12,13 @@ namespace Microsoft.Extensions.DependencyInjection } [Obsolete] - public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null) + public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, AbpConfigurationBuilderOptions options = null) { return services.GetHostingEnvironment().BuildConfiguration(options); } [Obsolete] - public static IConfigurationRoot AddConfiguration(this IServiceCollection services, ConfigurationBuilderOptions options = null) + public static IConfigurationRoot AddConfiguration(this IServiceCollection services, AbpConfigurationBuilderOptions options = null) { var configuration = services.BuildConfiguration(options); services.SetConfiguration(configuration); diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs similarity index 96% rename from framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs rename to framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs index aa55c0e876..b9ca026791 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationBuilderOptions.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs @@ -2,7 +2,7 @@ namespace Microsoft.Extensions.Configuration { - public class ConfigurationBuilderOptions + public class AbpConfigurationBuilderOptions { /// /// Used to set assembly which is used to get the user secret id for the application. diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs index 37e721f1af..6c0fe12b15 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs @@ -5,9 +5,9 @@ namespace Microsoft.Extensions.Configuration { public static class ConfigurationHelper { - public static IConfigurationRoot BuildConfiguration(ConfigurationBuilderOptions options = null) + public static IConfigurationRoot BuildConfiguration(AbpConfigurationBuilderOptions options = null) { - options = options ?? new ConfigurationBuilderOptions(); + options = options ?? new AbpConfigurationBuilderOptions(); if (options.BasePath.IsNullOrEmpty()) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs index 005471d9b9..e4d7744ae8 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs @@ -14,13 +14,13 @@ namespace Volo.Abp public PlugInSourceList PlugInSources { get; } [NotNull] - public ConfigurationBuilderOptions Configuration {get; } + public AbpConfigurationBuilderOptions Configuration {get; } public AbpApplicationCreationOptions([NotNull] IServiceCollection services) { Services = Check.NotNull(services, nameof(services)); PlugInSources = new PlugInSourceList(); - Configuration = new ConfigurationBuilderOptions(); + Configuration = new AbpConfigurationBuilderOptions(); } } } \ No newline at end of file From e19dc65af50d613e3c1b257ab9c4529ff140b5ad Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:08:51 +0300 Subject: [PATCH 09/96] CacheOptions to AbpCacheOptions --- .../src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs | 2 +- .../src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs | 4 ++-- .../src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs | 4 ++-- .../Volo/Abp/Caching/AbpCachingTestModule.cs | 2 +- .../Abp/Caching/DistributedCache_ConfigureOptions_Test.cs | 4 ++-- .../BookManagementHttpApiHostModule.cs | 2 +- .../BookManagementIdentityServerModule.cs | 2 +- .../BookManagementWebHostModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameWebHostModule.cs | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs index 48d55cc0d5..04a29d5fb2 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Caching context.Services.AddSingleton(typeof(IDistributedCache<>), typeof(DistributedCache<>)); - context.Services.Configure(cacheOptions => + context.Services.Configure(cacheOptions => { cacheOptions.GlobalCacheEntryOptions.SlidingExpiration = TimeSpan.FromMinutes(20); }); diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs index 0400da8c72..09e319c551 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace Volo.Abp.Caching { - public class CacheOptions + public class AbpCacheOptions { /// /// Cache key prefix. @@ -22,7 +22,7 @@ namespace Volo.Abp.Caching /// public List> CacheConfigurators { get; set; } //TODO list item use a configurator interface instead? - public CacheOptions() + public AbpCacheOptions() { CacheConfigurators = new List>(); GlobalCacheEntryOptions = new DistributedCacheEntryOptions(); diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs index caa51aeac1..7db967d38b 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs @@ -36,12 +36,12 @@ namespace Volo.Abp.Caching protected DistributedCacheEntryOptions DefaultCacheOptions; - private readonly CacheOptions _cacheOption; + private readonly AbpCacheOptions _cacheOption; private readonly DistributedCacheOptions _distributedCacheOption; public DistributedCache( - IOptions cacheOption, + IOptions cacheOption, IOptions distributedCacheOption, IDistributedCache cache, ICancellationTokenProvider cancellationTokenProvider, diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs index 0f790a03a3..4202736b03 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Caching { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(option => + Configure(option => { option.CacheConfigurators.Add(cacheName => { diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_ConfigureOptions_Test.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_ConfigureOptions_Test.cs index 711e1e0bce..adb0b01bfc 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_ConfigureOptions_Test.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_ConfigureOptions_Test.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.Caching public class DistributedCache_ConfigureOptions_Test : AbpIntegratedTest { [Fact] - public void Configure_CacheOptions() + public void Configure_AbpCacheOptions() { var personCache = GetRequiredService>(); GetDefaultCachingOptions(personCache).SlidingExpiration.ShouldBeNull(); @@ -18,7 +18,7 @@ namespace Volo.Abp.Caching } [Fact] - public async Task Default_CacheOptions_Should_Be_20_Mins() + public async Task Default_AbpCacheOptions_Should_Be_20_Mins() { var personCache = GetRequiredService>(); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 9a29e4e98f..6f67ab58dd 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -88,7 +88,7 @@ namespace Acme.BookStore.BookManagement options.ApiName = "BookManagement"; }); - Configure(options => + Configure(options => { options.KeyPrefix = "BookManagement:"; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs index dc71ba4059..1fe5437731 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs @@ -107,7 +107,7 @@ namespace Acme.BookStore.BookManagement options.ApiName = configuration["AuthServer:ApiName"]; }); - Configure(options => + Configure(options => { options.KeyPrefix = "BookManagement:"; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index 7da9bf2cc8..7c721decb2 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -86,7 +86,7 @@ namespace Acme.BookStore.BookManagement private void ConfigureCache(IConfigurationRoot configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "BookManagement:"; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 1c6ab51509..387baee3ea 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -55,7 +55,7 @@ namespace MyCompanyName.MyProjectName private void ConfigureCache(IConfigurationRoot configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index fd8c86b5d2..d0e6e40092 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -94,7 +94,7 @@ namespace MyCompanyName.MyProjectName options.IsJobExecutionEnabled = false; }); - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 4f5bf7dd44..12c788cac4 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -85,7 +85,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureCache(IConfigurationRoot configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 2d0190b60d..9ed173187e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -87,7 +87,7 @@ namespace MyCompanyName.MyProjectName options.ApiName = "MyProjectName"; }); - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 397afc38c3..8c77177835 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -107,7 +107,7 @@ namespace MyCompanyName.MyProjectName options.ApiName = configuration["AuthServer:ApiName"]; }); - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 5c1318e32b..99d8469d07 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -86,7 +86,7 @@ namespace MyCompanyName.MyProjectName private void ConfigureCache(IConfigurationRoot configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); From 4a69a6038f368a864c1571494279123b3ffc2f3c Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:10:07 +0300 Subject: [PATCH 10/96] file rename --- .../Volo/Abp/Caching/{CacheOptions.cs => AbpCacheOptions.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename framework/src/Volo.Abp.Caching/Volo/Abp/Caching/{CacheOptions.cs => AbpCacheOptions.cs} (100%) diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCacheOptions.cs similarity index 100% rename from framework/src/Volo.Abp.Caching/Volo/Abp/Caching/CacheOptions.cs rename to framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCacheOptions.cs From 2b05d27e0212959ad5966f14199017501822799e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:10:48 +0300 Subject: [PATCH 11/96] WidgetOptions to AbpWidgetOptions --- .../Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs | 2 +- .../Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs | 4 ++-- .../Mvc/UI/Widgets/{WidgetOptions.cs => AbpWidgetOptions.cs} | 4 ++-- .../Components/WidgetScripts/WidgetScriptsViewComponent.cs | 4 ++-- .../Components/WidgetStyles/WidgetStylesViewComponent.cs | 4 ++-- .../Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/{WidgetOptions.cs => AbpWidgetOptions.cs} (74%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs index e8f90483f8..0d48b5bf95 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs @@ -47,7 +47,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets } }); - services.Configure(options => + services.Configure(options => { foreach (var widgetType in widgetTypes) { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs index 1ef15ac8e6..826c7635cf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpViewComponentHelper.cs @@ -14,13 +14,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets [Dependency(ReplaceServices = true)] public class AbpViewComponentHelper : IViewComponentHelper, IViewContextAware, ITransientDependency { - protected WidgetOptions Options { get; } + protected AbpWidgetOptions Options { get; } protected IPageWidgetManager PageWidgetManager { get; } protected DefaultViewComponentHelper DefaultViewComponentHelper { get; } public AbpViewComponentHelper( DefaultViewComponentHelper defaultViewComponentHelper, - IOptions widgetOptions, + IOptions widgetOptions, IPageWidgetManager pageWidgetManager) { DefaultViewComponentHelper = defaultViewComponentHelper; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpWidgetOptions.cs similarity index 74% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpWidgetOptions.cs index 46fa88fe16..3d2190447b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpWidgetOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets { - public class WidgetOptions + public class AbpWidgetOptions { public WidgetDefinitionCollection Widgets { get; } - public WidgetOptions() + public AbpWidgetOptions() { Widgets = new WidgetDefinitionCollection(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetScripts/WidgetScriptsViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetScripts/WidgetScriptsViewComponent.cs index 88f7214c7a..7d2f55cbce 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetScripts/WidgetScriptsViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetScripts/WidgetScriptsViewComponent.cs @@ -7,11 +7,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts public class WidgetScriptsViewComponent : AbpViewComponent { protected IPageWidgetManager PageWidgetManager { get; } - protected WidgetOptions Options { get; } + protected AbpWidgetOptions Options { get; } public WidgetScriptsViewComponent( IPageWidgetManager pageWidgetManager, - IOptions options) + IOptions options) { PageWidgetManager = pageWidgetManager; Options = options.Value; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetStyles/WidgetStylesViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetStyles/WidgetStylesViewComponent.cs index 1a5b150b09..f72500ff39 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetStyles/WidgetStylesViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/Components/WidgetStyles/WidgetStylesViewComponent.cs @@ -6,11 +6,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles public class WidgetStylesViewComponent : AbpViewComponent { protected IPageWidgetManager PageWidgetManager { get; } - protected WidgetOptions Options { get; } + protected AbpWidgetOptions Options { get; } public WidgetStylesViewComponent( IPageWidgetManager pageWidgetManager, - IOptions options) + IOptions options) { PageWidgetManager = pageWidgetManager; Options = options.Value; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs index 54bd8cb274..ffd03d28dc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/WidgetManager.cs @@ -9,12 +9,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets { public class WidgetManager : IWidgetManager { - protected WidgetOptions Options { get; } + protected AbpWidgetOptions Options { get; } protected IAuthorizationService AuthorizationService { get; } protected ICurrentUser CurrentUser { get; } public WidgetManager( - IOptions widgetOptions, + IOptions widgetOptions, IAuthorizationService authorizationService, ICurrentUser currentUser) { From 754253dc98453b8535992cc8028cc796145a9254 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:12:52 +0300 Subject: [PATCH 12/96] StringEncryptionOptions to AbpStringEncryptionOptions --- ...ringEncryptionOptions.cs => AbpStringEncryptionOptions.cs} | 4 ++-- .../Volo/Abp/Security/Encryption/IStringEncryptionService.cs | 2 +- .../Volo/Abp/Security/Encryption/StringEncryptionService.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/{StringEncryptionOptions.cs => AbpStringEncryptionOptions.cs} (94%) diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/AbpStringEncryptionOptions.cs similarity index 94% rename from framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs rename to framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/AbpStringEncryptionOptions.cs index 67eae167c3..ee3599074d 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionOptions.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/AbpStringEncryptionOptions.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.Security.Encryption /// /// Options used by . /// - public class StringEncryptionOptions + public class AbpStringEncryptionOptions { /// /// This constant is used to determine the keysize of the encryption algorithm. @@ -33,7 +33,7 @@ namespace Volo.Abp.Security.Encryption /// public byte[] DefaultSalt { get; set; } - public StringEncryptionOptions() + public AbpStringEncryptionOptions() { Keysize = 256; DefaultPassPhrase = "gsKnGZ041HLL4IM8"; diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/IStringEncryptionService.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/IStringEncryptionService.cs index bad4e33251..f94edf736a 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/IStringEncryptionService.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/IStringEncryptionService.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.Security.Encryption { /// /// Can be used to simply encrypt/decrypt texts. - /// Use to configure default values. + /// Use to configure default values. /// public interface IStringEncryptionService { diff --git a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionService.cs b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionService.cs index 1d235d1d84..57543a8b75 100644 --- a/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionService.cs +++ b/framework/src/Volo.Abp.Security/Volo/Abp/Security/Encryption/StringEncryptionService.cs @@ -12,9 +12,9 @@ namespace Volo.Abp.Security.Encryption /// public class StringEncryptionService : IStringEncryptionService, ITransientDependency { - protected StringEncryptionOptions Options { get; } + protected AbpStringEncryptionOptions Options { get; } - public StringEncryptionService(IOptions options) + public StringEncryptionService(IOptions options) { Options = options.Value; } From 3dc5bf3a110ead1daa338c1129af3987a3ce3afb Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:14:03 +0300 Subject: [PATCH 13/96] TenantResolveOptions to AbpTenantResolveOptions --- .../MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs | 2 +- .../Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs | 2 +- .../{TenantResolveOptions.cs => AbpTenantResolveOptions.cs} | 4 ++-- .../Volo/Abp/MultiTenancy/TenantResolver.cs | 4 ++-- .../AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/{TenantResolveOptions.cs => AbpTenantResolveOptions.cs} (81%) diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs index 64219b14d2..d757b2f5f8 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.TenantResolvers.Add(new QueryStringTenantResolveContributor()); options.TenantResolvers.Add(new RouteTenantResolveContributor()); diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs index 4b473cbf38..539a683d3d 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.MultiTenancy { public static class MultiTenancyOptionsExtensions { - public static void AddDomainTenantResolver(this TenantResolveOptions options, string domainFormat) + public static void AddDomainTenantResolver(this AbpTenantResolveOptions options, string domainFormat) { options.TenantResolvers.InsertAfter( r => r is CurrentUserTenantResolveContributor, diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs similarity index 81% rename from framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs index b431aaa6d3..66ca66a0b0 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolveOptions.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpTenantResolveOptions.cs @@ -3,12 +3,12 @@ using JetBrains.Annotations; namespace Volo.Abp.MultiTenancy { - public class TenantResolveOptions + public class AbpTenantResolveOptions { [NotNull] public List TenantResolvers { get; } - public TenantResolveOptions() + public AbpTenantResolveOptions() { TenantResolvers = new List { diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs index cefaf41329..202ab4c293 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolver.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.MultiTenancy public class TenantResolver : ITenantResolver, ITransientDependency { private readonly IServiceProvider _serviceProvider; - private readonly TenantResolveOptions _options; + private readonly AbpTenantResolveOptions _options; - public TenantResolver(IOptions options, IServiceProvider serviceProvider) + public TenantResolver(IOptions options, IServiceProvider serviceProvider) { _serviceProvider = serviceProvider; _options = options.Value; diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs index c107444ba1..ed440cb130 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs @@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy }; }); - services.Configure(options => + services.Configure(options => { options.AddDomainTenantResolver("{0}.abp.io"); }); From 547f78d9ac00da9015b4ae9e8a220b319fcf0b74 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:15:43 +0300 Subject: [PATCH 14/96] MultiTenancyOptionsExtensions to AbpMultiTenancyOptionsExtensions --- .../Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs | 2 +- .../{MultiTenancyOptions.cs => AbpMultiTenancyOptions.cs} | 2 +- .../Volo/Abp/AspNetCore/App/AppModule.cs | 2 +- .../src/Acme.BookStore.Domain/BookStoreDomainModule.cs | 2 +- .../src/Acme.BookStore.Domain/BookStoreDomainModule.cs | 2 +- .../BookManagementHttpApiHostModule.cs | 2 +- .../BookManagementWebHostModule.cs | 2 +- .../BookManagementWebUnifiedModule.cs | 2 +- .../src/Acme.BookStore.Domain/BookStoreDomainModule.cs | 2 +- .../src/DashboardDemo.Domain/DashboardDemoDomainModule.cs | 2 +- .../MyProjectNameDomainModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameWebHostModule.cs | 2 +- .../MyProjectNameWebUnifiedModule.cs | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/{MultiTenancyOptions.cs => AbpMultiTenancyOptions.cs} (92%) diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs index 539a683d3d..aa6f0fdb0e 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs @@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.MultiTenancy; namespace Volo.Abp.MultiTenancy { - public static class MultiTenancyOptionsExtensions + public static class AbpMultiTenancyOptionsExtensions { public static void AddDomainTenantResolver(this AbpTenantResolveOptions options, string domainFormat) { diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs similarity index 92% rename from framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptions.cs rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs index 2ac3e6a2fa..5db8513da3 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptions.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.MultiTenancy { - public class MultiTenancyOptions + public class AbpMultiTenancyOptions { /// /// A central point to enable/disable multi-tenancy. diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs index 93543c3025..44e2e38380 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/AppModule.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.AspNetCore.App { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsEnabled = true; }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 950bd62d1b..91cae5f506 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -29,7 +29,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 0982c3f851..3c5fabb562 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -31,7 +31,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 6f67ab58dd..6eddcf5707 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -47,7 +47,7 @@ namespace Acme.BookStore.BookManagement options.UseSqlServer(); }); - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index 7c721decb2..78072c9fe1 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -102,7 +102,7 @@ namespace Acme.BookStore.BookManagement private void ConfigureMultiTenancy() { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs index 31a3162acc..bb4ec08c12 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs @@ -95,7 +95,7 @@ namespace Acme.BookStore.BookManagement options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "Chinese")); }); - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 950bd62d1b..91cae5f506 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -29,7 +29,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs index be3f587599..0b0a2b5d76 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs @@ -29,7 +29,7 @@ namespace DashboardDemo { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index c8434867e3..01d68fa87a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -29,7 +29,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 12c788cac4..5028b6d344 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -101,7 +101,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureMultiTenancy() { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 9ed173187e..84517aacc3 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -46,7 +46,7 @@ namespace MyCompanyName.MyProjectName options.UseSqlServer(); }); - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 99d8469d07..ef0e9556fd 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -102,7 +102,7 @@ namespace MyCompanyName.MyProjectName private void ConfigureMultiTenancy() { - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index ccfc845eaf..0999f1d3b2 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -94,7 +94,7 @@ namespace MyCompanyName.MyProjectName options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "Chinese")); }); - Configure(options => + Configure(options => { options.IsEnabled = MultiTenancyConsts.IsEnabled; }); From 64cf179f93badce0b8fc5d56aa1857905376da62 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:17:51 +0300 Subject: [PATCH 15/96] DefaultTenantStoreOptions to AbpDefaultTenantStoreOptions --- .../Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs | 2 +- ...tTenantStoreOptions.cs => AbpDefaultTenantStoreOptions.cs} | 4 ++-- .../Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs | 4 ++-- .../AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs | 2 +- .../AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs | 2 +- .../MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs | 2 +- .../Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/{DefaultTenantStoreOptions.cs => AbpDefaultTenantStoreOptions.cs} (68%) diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs index 75d5631658..9dc64ef7f8 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs @@ -17,7 +17,7 @@ namespace Volo.Abp.MultiTenancy public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - Configure(configuration); + Configure(configuration); } } } diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs similarity index 68% rename from framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs index ee775cce98..72027efa62 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore { - public class DefaultTenantStoreOptions + public class AbpDefaultTenantStoreOptions { public TenantConfiguration[] Tenants { get; set; } - public DefaultTenantStoreOptions() + public AbpDefaultTenantStoreOptions() { Tenants = new TenantConfiguration[0]; } diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs index edecf22b65..ebdbe2a280 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs @@ -9,9 +9,9 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore [Dependency(TryRegister = true)] public class DefaultTenantStore : ITenantStore, ITransientDependency { - private readonly DefaultTenantStoreOptions _options; + private readonly AbpDefaultTenantStoreOptions _options; - public DefaultTenantStore(IOptionsSnapshot options) + public DefaultTenantStore(IOptionsSnapshot options) { _options = options.Value; } diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs index ed440cb130..310817b8d8 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { return base.CreateWebHostBuilder().ConfigureServices(services => { - services.Configure(options => + services.Configure(options => { options.Tenants = new[] { diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs index 98a7e92ef1..4b5c3f7ecc 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { return base.CreateWebHostBuilder().ConfigureServices(services => { - services.Configure(options => + services.Configure(options => { options.Tenants = new[] { diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs index 20f926f212..aea2810d5e 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.Data.MultiTenancy options.ConnectionStrings["db1"] = "db1-default-value"; }); - services.Configure(options => + services.Configure(options => { options.Tenants = new[] { diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs index 4bd1c6bad3..0790a54c65 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.MultiTenancy protected override void BeforeAddApplication(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.Tenants = new[] { From b7e2ec64a2e7bf13c701d7782aaf0ad04fe45d50 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:19:39 +0300 Subject: [PATCH 16/96] LdapOptions to AbpLdapOptions --- framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs | 2 +- .../Volo/Abp/Ldap/{LdapOptions.cs => AbpLdapOptions.cs} | 4 ++-- framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs | 4 ++-- .../Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs | 2 +- .../Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/{LdapOptions.cs => AbpLdapOptions.cs} (87%) diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs index 22b9ca7a76..b35e1b1d59 100644 --- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs +++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapModule.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.Ldap public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - Configure(configuration.GetSection("LDAP")); + Configure(configuration.GetSection("LDAP")); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapOptions.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs similarity index 87% rename from framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapOptions.cs rename to framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs index 7e4aacfa0e..671d623ff7 100644 --- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapOptions.cs +++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Ldap { - public class LdapOptions + public class AbpLdapOptions { public string ServerHost { get; set; } @@ -16,7 +16,7 @@ public LdapCredentials Credentials { get; set; } - public LdapOptions() + public AbpLdapOptions() { Credentials = new LdapCredentials(); } diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs index 615b22d70e..d54e7d82d0 100644 --- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs +++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.Ldap public class LdapManager : ILdapManager, ITransientDependency { private readonly string _searchBase; - private readonly LdapOptions _ldapOptions; + private readonly AbpLdapOptions _ldapOptions; private readonly string[] _attributes = { @@ -21,7 +21,7 @@ namespace Volo.Abp.Ldap "sAMAccountName", "userPrincipalName", "telephoneNumber", "mail" }; - public LdapManager(IOptions ldapSettingsOptions) + public LdapManager(IOptions ldapSettingsOptions) { _ldapOptions = ldapSettingsOptions.Value; _searchBase = _ldapOptions.SearchBase; diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs index 35f631b8d2..c59dc0d9e1 100644 --- a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs +++ b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/Authenticate_Tests.cs @@ -57,7 +57,7 @@ namespace Volo.Abp.Ldap // "ServerPort": 636, // "UseSSL": true // } - Configure(settings => + Configure(settings => { settings.ServerHost = "192.168.101.54"; settings.ServerPort = 636; diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs index 00d9287c4f..01906c8f18 100644 --- a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs +++ b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs @@ -227,7 +227,7 @@ namespace Volo.Abp.Ldap // "DomainName": "yourdomain.com.cn", // "DomainDistinguishedName": "DC=yourdomain,DC=com,DC=cn" // } - Configure(settings => + Configure(settings => { settings.ServerHost = "192.168.101.54"; settings.ServerPort = 636; From 451f4fd48e14f6b17ddd36fbd684770d3265ab1f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:20:39 +0300 Subject: [PATCH 17/96] EmailTemplateOptions to AbpEmailTemplateOptions --- .../Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs | 2 +- .../{EmailTemplateOptions.cs => AbpEmailTemplateOptions.cs} | 4 ++-- .../Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs | 4 ++-- .../Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/{EmailTemplateOptions.cs => AbpEmailTemplateOptions.cs} (82%) diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs index d3a9598da1..2d739c9fae 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs @@ -49,7 +49,7 @@ namespace Volo.Abp.Emailing } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/AbpEmailTemplateOptions.cs similarity index 82% rename from framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs rename to framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/AbpEmailTemplateOptions.cs index 57533b1aff..cb5a9d370b 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateOptions.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/AbpEmailTemplateOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Emailing.Templates { - public class EmailTemplateOptions + public class AbpEmailTemplateOptions { public string DefaultLayout { get; set; } public ITypeList DefinitionProviders { get; } - public EmailTemplateOptions() + public AbpEmailTemplateOptions() { DefaultLayout = StandardEmailTemplates.DefaultLayout; diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs index a6a58aef27..0491dc867e 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinitionManager.cs @@ -12,12 +12,12 @@ namespace Volo.Abp.Emailing.Templates { protected Lazy> EmailTemplateDefinitions { get; } - protected EmailTemplateOptions Options { get; } + protected AbpEmailTemplateOptions Options { get; } protected IServiceProvider ServiceProvider { get; } public EmailTemplateDefinitionManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider) { ServiceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs index e8a2a9bac8..c67af27757 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs @@ -12,12 +12,12 @@ namespace Volo.Abp.Emailing.Templates { protected IEmailTemplateDefinitionManager EmailTemplateDefinitionManager; protected ITemplateLocalizer TemplateLocalizer { get; } - protected EmailTemplateOptions Options { get; } + protected AbpEmailTemplateOptions Options { get; } protected IStringLocalizerFactory StringLocalizerFactory; public EmailTemplateProvider(IEmailTemplateDefinitionManager emailTemplateDefinitionManager, ITemplateLocalizer templateLocalizer, IStringLocalizerFactory stringLocalizerFactory, - IOptions options) + IOptions options) { EmailTemplateDefinitionManager = emailTemplateDefinitionManager; TemplateLocalizer = templateLocalizer; From 9c7ef8f2b8c22646f5729ed225707dc82b54fa41 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:21:42 +0300 Subject: [PATCH 18/96] DataSeedOptions to AbpDataSeedOptions --- framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs | 2 +- .../Abp/Data/{DataSeedOptions.cs => AbpDataSeedOptions.cs} | 4 ++-- framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.Data/Volo/Abp/Data/{DataSeedOptions.cs => AbpDataSeedOptions.cs} (71%) diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs index 584298f2d4..f689518fc1 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs @@ -37,7 +37,7 @@ namespace Volo.Abp.Data } }); - services.Configure(options => + services.Configure(options => { options.Contributors.AddIfNotContains(contributors); }); diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedOptions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataSeedOptions.cs similarity index 71% rename from framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedOptions.cs rename to framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataSeedOptions.cs index 940f68175d..a641fe8016 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeedOptions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataSeedOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.Data { - public class DataSeedOptions + public class AbpDataSeedOptions { public DataSeedContributorList Contributors { get; } - public DataSeedOptions() + public AbpDataSeedOptions() { Contributors = new DataSeedContributorList(); } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs index a4d6c0886b..c20badbeb7 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataSeeder.cs @@ -10,10 +10,10 @@ namespace Volo.Abp.Data public class DataSeeder : IDataSeeder, ITransientDependency { protected IHybridServiceScopeFactory ServiceScopeFactory { get; } - protected DataSeedOptions Options { get; } + protected AbpDataSeedOptions Options { get; } public DataSeeder( - IOptions options, + IOptions options, IHybridServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; From bfa674fcdfa146e585c1424997c46e9a3b6eb585 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:23:08 +0300 Subject: [PATCH 19/96] CliOptions to AbpCliOptions --- .../Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs | 2 +- .../Volo/Abp/Cli/{CliOptions.cs => AbpCliOptions.cs} | 4 ++-- .../Volo/Abp/Cli/Commands/CommandSelector.cs | 4 ++-- .../Volo/Abp/Cli/Commands/HelpCommand.cs | 10 +++++----- .../Volo/Abp/Cli/Commands/UpdateCommand.cs | 4 ++-- .../Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs | 4 ++-- .../Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs | 4 ++-- .../Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/{CliOptions.cs => AbpCliOptions.cs} (89%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index b51ef5fb2d..a616d29409 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.Cli // a permanent fix will probably be published with the release of .net core 3.0: https://github.com/dotnet/corefx/issues/36553 AppContext.SetSwitch("System.Net.Http.UseSocketsHttpHandler", false); - Configure(options => + Configure(options => { options.Commands["help"] = typeof(HelpCommand); options.Commands["new"] = typeof(NewCommand); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs similarity index 89% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs index ca9e61bf82..8cca4a160e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace Volo.Abp.Cli { - public class CliOptions + public class AbpCliOptions { public Dictionary Commands { get; } @@ -17,7 +17,7 @@ namespace Volo.Abp.Cli /// public string ToolName { get; set; } = "CLI"; - public CliOptions() + public AbpCliOptions() { Commands = new Dictionary(StringComparer.OrdinalIgnoreCase); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs index 595917e845..f77a002370 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -8,9 +8,9 @@ namespace Volo.Abp.Cli.Commands { public class CommandSelector : ICommandSelector, ITransientDependency { - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } - public CommandSelector(IOptions options) + public CommandSelector(IOptions options) { Options = options.Value; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index 38e8d075d0..dd9145e8db 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -13,15 +13,15 @@ namespace Volo.Abp.Cli.Commands public class HelpCommand : IConsoleCommand, ITransientDependency { public ILogger Logger { get; set; } - protected CliOptions CliOptions { get; } + protected AbpCliOptions AbpCliOptions { get; } protected IHybridServiceScopeFactory ServiceScopeFactory { get; } - public HelpCommand(IOptions cliOptions, + public HelpCommand(IOptions cliOptions, IHybridServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; Logger = NullLogger.Instance; - CliOptions = cliOptions.Value; + AbpCliOptions = cliOptions.Value; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) @@ -32,7 +32,7 @@ namespace Volo.Abp.Cli.Commands return; } - var commandType = CliOptions.Commands[commandLineArgs.Target]; + var commandType = AbpCliOptions.Commands[commandLineArgs.Target]; using (var scope = ServiceScopeFactory.CreateScope()) { @@ -53,7 +53,7 @@ namespace Volo.Abp.Cli.Commands sb.AppendLine("Command List:"); sb.AppendLine(""); - foreach (var command in CliOptions.Commands.ToArray()) + foreach (var command in AbpCliOptions.Commands.ToArray()) { string shortDescription; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 97c11f1f29..0f31af2eb0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -21,14 +21,14 @@ namespace Volo.Abp.Cli.Commands private readonly VoloNugetPackagesVersionUpdater _nugetPackagesVersionUpdater; private readonly NpmPackagesUpdater _npmPackagesUpdater; private readonly ICliAnalyticsCollect _cliAnalyticsCollect; - private readonly CliOptions _options; + private readonly AbpCliOptions _options; private readonly IJsonSerializer _jsonSerializer; public UpdateCommand(VoloNugetPackagesVersionUpdater nugetPackagesVersionUpdater, NpmPackagesUpdater npmPackagesUpdater, ICliAnalyticsCollect cliAnalyticsCollect, IJsonSerializer jsonSerializer, - IOptions options) + IOptions options) { _nugetPackagesVersionUpdater = nugetPackagesVersionUpdater; _npmPackagesUpdater = npmPackagesUpdater; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs index ac51be6fac..fd0a0e5246 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs @@ -21,7 +21,7 @@ namespace Volo.Abp.Cli.ProjectBuilding { public ILogger Logger { get; set; } - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } protected IJsonSerializer JsonSerializer { get; } @@ -30,7 +30,7 @@ namespace Volo.Abp.Cli.ProjectBuilding protected ICancellationTokenProvider CancellationTokenProvider { get; } public AbpIoSourceCodeStore( - IOptions options, + IOptions options, IJsonSerializer jsonSerializer, IRemoteServiceExceptionHandler remoteServiceExceptionHandler, ICancellationTokenProvider cancellationTokenProvider) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs index 57332bd5e2..48f109e1d3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs @@ -20,14 +20,14 @@ namespace Volo.Abp.Cli.ProjectBuilding protected ISourceCodeStore SourceCodeStore { get; } protected IModuleInfoProvider ModuleInfoProvider { get; } protected ICliAnalyticsCollect CliAnalyticsCollect { get; } - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } protected IJsonSerializer JsonSerializer { get; } protected IApiKeyService ApiKeyService { get; } public ModuleProjectBuilder(ISourceCodeStore sourceCodeStore, IModuleInfoProvider moduleInfoProvider, ICliAnalyticsCollect cliAnalyticsCollect, - IOptions options, + IOptions options, IJsonSerializer jsonSerializer, IApiKeyService apiKeyService) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs index e1248b32f0..9d31e10200 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs @@ -20,14 +20,14 @@ namespace Volo.Abp.Cli.ProjectBuilding protected ISourceCodeStore SourceCodeStore { get; } protected ITemplateInfoProvider TemplateInfoProvider { get; } protected ICliAnalyticsCollect CliAnalyticsCollect { get; } - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } protected IJsonSerializer JsonSerializer { get; } protected IApiKeyService ApiKeyService { get; } public TemplateProjectBuilder(ISourceCodeStore sourceCodeStore, ITemplateInfoProvider templateInfoProvider, ICliAnalyticsCollect cliAnalyticsCollect, - IOptions options, + IOptions options, IJsonSerializer jsonSerializer, IApiKeyService apiKeyService) { From 0db4aeeda259e90cc4ddfcb654b2c7614e8978b3 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:24:10 +0300 Subject: [PATCH 20/96] CommandLineOptions to AbpCommandLineOptions --- .../Args/{CommandLineOptions.cs => AbpCommandLineOptions.cs} | 2 +- .../Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/{CommandLineOptions.cs => AbpCommandLineOptions.cs} (92%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/AbpCommandLineOptions.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/AbpCommandLineOptions.cs index 3e72d6e434..650e48b15e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/AbpCommandLineOptions.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; namespace Volo.Abp.Cli.Args { - public class CommandLineOptions : Dictionary + public class AbpCommandLineOptions : Dictionary { [CanBeNull] public string GetOrNull([NotNull] string name, params string[] alternativeNames) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs index 5e1191c385..097c661877 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs @@ -14,13 +14,13 @@ namespace Volo.Abp.Cli.Args public string Target { get; } [NotNull] - public CommandLineOptions Options { get; } + public AbpCommandLineOptions Options { get; } public CommandLineArgs([CanBeNull] string command = null, [CanBeNull] string target = null) { Command = command; Target = target; - Options = new CommandLineOptions(); + Options = new AbpCommandLineOptions(); } public static CommandLineArgs Empty() From 41ce85f253c2d4aa79bdb9e1acc685eaa2942648 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:24:57 +0300 Subject: [PATCH 21/96] AspNetCoreContentOptions to AbpAspNetCoreContentOptions --- ...etCoreContentOptions.cs => AbpAspNetCoreContentOptions.cs} | 4 ++-- .../AspNetCore/VirtualFileSystem/WebContentFileProvider.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/{AspNetCoreContentOptions.cs => AbpAspNetCoreContentOptions.cs} (89%) diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AbpAspNetCoreContentOptions.cs similarity index 89% rename from framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs rename to framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AbpAspNetCoreContentOptions.cs index c4265c7ced..ce6e454f54 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AspNetCoreContentOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AbpAspNetCoreContentOptions.cs @@ -2,12 +2,12 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem { - public class AspNetCoreContentOptions + public class AbpAspNetCoreContentOptions { public List AllowedExtraWebContentFolders { get; } public List AllowedExtraWebContentFileExtensions { get; } - public AspNetCoreContentOptions() + public AbpAspNetCoreContentOptions() { AllowedExtraWebContentFolders = new List { diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs index ebc7446d68..1b71dad8cb 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs @@ -17,12 +17,12 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem private readonly IWebHostEnvironment _hostingEnvironment; private string _rootPath = "/wwwroot"; //TODO: How to handle wwwroot naming? - protected AspNetCoreContentOptions Options { get; } + protected AbpAspNetCoreContentOptions Options { get; } public WebContentFileProvider( IVirtualFileProvider virtualFileProvider, IWebHostEnvironment hostingEnvironment, - IOptions options) + IOptions options) { _virtualFileProvider = virtualFileProvider; _hostingEnvironment = hostingEnvironment; From 80f9abcb6048b7967ba54e87f8aebb8a5febdd1a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:25:45 +0300 Subject: [PATCH 22/96] LayoutHookOptions to AbpLayoutHookOptions --- .../{LayoutHookOptions.cs => AbpLayoutHookOptions.cs} | 6 +++--- .../Mvc/UI/Components/LayoutHook/LayoutHookViewComponent.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/{LayoutHookOptions.cs => AbpLayoutHookOptions.cs} (73%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/AbpLayoutHookOptions.cs similarity index 73% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/AbpLayoutHookOptions.cs index e51f491f64..fd874b6706 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/AbpLayoutHookOptions.cs @@ -3,16 +3,16 @@ using System.Collections.Generic; namespace Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook { - public class LayoutHookOptions + public class AbpLayoutHookOptions { public IDictionary> Hooks { get; } - public LayoutHookOptions() + public AbpLayoutHookOptions() { Hooks = new Dictionary>(); } - public LayoutHookOptions Add(string name, Type componentType, string layout = null) + public AbpLayoutHookOptions Add(string name, Type componentType, string layout = null) { Hooks .GetOrAdd(name, () => new List()) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookViewComponent.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookViewComponent.cs index 85527037a8..5f5d050e4d 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookViewComponent.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookViewComponent.cs @@ -7,9 +7,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook { public class LayoutHookViewComponent : AbpViewComponent { - protected LayoutHookOptions Options { get; } + protected AbpLayoutHookOptions Options { get; } - public LayoutHookViewComponent(IOptions options) + public LayoutHookViewComponent(IOptions options) { Options = options.Value; } From adb71a5e65a4e62e39d2e0ab1ac13affd61fb5d5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:26:37 +0300 Subject: [PATCH 23/96] FeatureOptions to AbpFeatureOptions --- .../Abp/Features/{FeatureOptions.cs => AbpFeatureOptions.cs} | 4 ++-- .../Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs | 4 ++-- .../src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs | 4 ++-- .../Volo/Abp/Features/FeatureDefinitionManager.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.Features/Volo/Abp/Features/{FeatureOptions.cs => AbpFeatureOptions.cs} (85%) diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureOptions.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureOptions.cs similarity index 85% rename from framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureOptions.cs rename to framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureOptions.cs index f988acf34c..e0526832fb 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureOptions.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeatureOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Features { - public class FeatureOptions + public class AbpFeatureOptions { public ITypeList DefinitionProviders { get; } public ITypeList ValueProviders { get; } - public FeatureOptions() + public AbpFeatureOptions() { DefinitionProviders = new TypeList(); ValueProviders = new TypeList(); diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs index e66dd03010..f30017feed 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.Features public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.Configure(options => + context.Services.Configure(options => { options.ValueProviders.Add(); options.ValueProviders.Add(); @@ -43,7 +43,7 @@ namespace Volo.Abp.Features } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs index bc9f8565ed..0c653c3448 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureChecker.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Features { public class FeatureChecker : FeatureCheckerBase { - protected FeatureOptions Options { get; } + protected AbpFeatureOptions Options { get; } protected IServiceProvider ServiceProvider { get; } protected IFeatureDefinitionManager FeatureDefinitionManager { get; } protected List Providers => _providers.Value; @@ -17,7 +17,7 @@ namespace Volo.Abp.Features private readonly Lazy> _providers; public FeatureChecker( - IOptions options, + IOptions options, IServiceProvider serviceProvider, IFeatureDefinitionManager featureDefinitionManager) { diff --git a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs index 84b9088a3d..f8e8d9e9fe 100644 --- a/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs +++ b/framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinitionManager.cs @@ -16,12 +16,12 @@ namespace Volo.Abp.Features protected IDictionary FeatureDefinitions => _lazyFeatureDefinitions.Value; private readonly Lazy> _lazyFeatureDefinitions; - protected FeatureOptions Options { get; } + protected AbpFeatureOptions Options { get; } private readonly IServiceScopeFactory _serviceScopeFactory; public FeatureDefinitionManager( - IOptions options, + IOptions options, IServiceScopeFactory serviceScopeFactory) { _serviceScopeFactory = serviceScopeFactory; From 03815ea07ea7e4737f70ba85152a00ff6853824b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:27:47 +0300 Subject: [PATCH 24/96] CorrelationIdOptions to AbpCorrelationIdOptions --- .../Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs | 6 +++--- .../AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs | 4 ++-- ...CorrelationIdOptions.cs => AbpCorrelationIdOptions.cs} | 2 +- .../Client/DynamicProxying/DynamicHttpProxyInterceptor.cs | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) rename framework/src/Volo.Abp.Core/Volo/Abp/Tracing/{CorrelationIdOptions.cs => AbpCorrelationIdOptions.cs} (81%) diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs index e9a7def252..b3ee565100 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs @@ -8,10 +8,10 @@ namespace Volo.Abp.AspNetCore.Tracing { public class AbpCorrelationIdMiddleware : IMiddleware, ITransientDependency { - private readonly CorrelationIdOptions _options; + private readonly AbpCorrelationIdOptions _options; private readonly ICorrelationIdProvider _correlationIdProvider; - public AbpCorrelationIdMiddleware(IOptions options, + public AbpCorrelationIdMiddleware(IOptions options, ICorrelationIdProvider correlationIdProvider) { _options = options.Value; @@ -34,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Tracing protected virtual void CheckAndSetCorrelationIdOnResponse( HttpContext httpContext, - CorrelationIdOptions options, + AbpCorrelationIdOptions options, string correlationId) { if (httpContext.Response.HasStarted) diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs index e62f1ed2a4..7b9915cbd9 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AspNetCoreCorrelationIdProvider.cs @@ -10,11 +10,11 @@ namespace Volo.Abp.AspNetCore.Tracing public class AspNetCoreCorrelationIdProvider : ICorrelationIdProvider, ITransientDependency { protected IHttpContextAccessor HttpContextAccessor { get; } - protected CorrelationIdOptions Options { get; } + protected AbpCorrelationIdOptions Options { get; } public AspNetCoreCorrelationIdProvider( IHttpContextAccessor httpContextAccessor, - IOptions options) + IOptions options) { HttpContextAccessor = httpContextAccessor; Options = options.Value; diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/AbpCorrelationIdOptions.cs similarity index 81% rename from framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/Tracing/AbpCorrelationIdOptions.cs index 0b794674ad..38cd6ca87f 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/CorrelationIdOptions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Tracing/AbpCorrelationIdOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Tracing { - public class CorrelationIdOptions + public class AbpCorrelationIdOptions { public string HttpHeaderName { get; set; } = "X-Correlation-Id"; diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs index 8e8e2a6492..4e976a25cd 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying protected ICancellationTokenProvider CancellationTokenProvider { get; } protected ICorrelationIdProvider CorrelationIdProvider { get; } protected ICurrentTenant CurrentTenant { get; } - protected CorrelationIdOptions CorrelationIdOptions { get; } + protected AbpCorrelationIdOptions AbpCorrelationIdOptions { get; } protected IDynamicProxyHttpClientFactory HttpClientFactory { get; } protected IApiDescriptionFinder ApiDescriptionFinder { get; } protected RemoteServiceOptions RemoteServiceOptions { get; } @@ -57,13 +57,13 @@ namespace Volo.Abp.Http.Client.DynamicProxying IRemoteServiceHttpClientAuthenticator clientAuthenticator, ICancellationTokenProvider cancellationTokenProvider, ICorrelationIdProvider correlationIdProvider, - IOptions correlationIdOptions, + IOptions correlationIdOptions, ICurrentTenant currentTenant) { CancellationTokenProvider = cancellationTokenProvider; CorrelationIdProvider = correlationIdProvider; CurrentTenant = currentTenant; - CorrelationIdOptions = correlationIdOptions.Value; + AbpCorrelationIdOptions = correlationIdOptions.Value; HttpClientFactory = httpClientFactory; ApiDescriptionFinder = apiDescriptionFinder; JsonSerializer = jsonSerializer; @@ -215,7 +215,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying } //CorrelationId - requestMessage.Headers.Add(CorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get()); + requestMessage.Headers.Add(AbpCorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get()); //TenantId if (CurrentTenant.Id.HasValue) From bc5fd577a1c542b0c87148e7127a52570e897eaf Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:28:53 +0300 Subject: [PATCH 25/96] SettingOptions to AbpSettingOptions --- .../Abp/Settings/{SettingOptions.cs => AbpSettingOptions.cs} | 4 ++-- .../Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs | 4 ++-- .../Volo/Abp/Settings/SettingDefinitionManager.cs | 4 ++-- .../Volo/Abp/Settings/SettingValueProviderManager.cs | 4 ++-- .../Volo/Abp/Settings/AbpSettingsTestModule.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename framework/src/Volo.Abp.Settings/Volo/Abp/Settings/{SettingOptions.cs => AbpSettingOptions.cs} (85%) diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs similarity index 85% rename from framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs rename to framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs index d916f1a95d..194a608c3f 100644 --- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingOptions.cs +++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Settings { - public class SettingOptions + public class AbpSettingOptions { public ITypeList DefinitionProviders { get; } public ITypeList ValueProviders { get; } - public SettingOptions() + public AbpSettingOptions() { DefinitionProviders = new TypeList(); ValueProviders = new TypeList(); diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs index 5f7f6ce7f5..48a85dd7d9 100644 --- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs +++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/AbpSettingsModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Settings public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.ValueProviders.Add(); options.ValueProviders.Add(); @@ -43,7 +43,7 @@ namespace Volo.Abp.Settings } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs index 387ea77d05..649d07f641 100644 --- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs +++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingDefinitionManager.cs @@ -12,12 +12,12 @@ namespace Volo.Abp.Settings { protected Lazy> SettingDefinitions { get; } - protected SettingOptions Options { get; } + protected AbpSettingOptions Options { get; } protected IServiceProvider ServiceProvider { get; } public SettingDefinitionManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider) { ServiceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs index ce10a20a31..4b8c0ddca3 100644 --- a/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs +++ b/framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingValueProviderManager.cs @@ -10,12 +10,12 @@ namespace Volo.Abp.Settings public class SettingValueProviderManager : ISettingValueProviderManager, ISingletonDependency { public List Providers => _lazyProviders.Value; - protected SettingOptions Options { get; } + protected AbpSettingOptions Options { get; } private readonly Lazy> _lazyProviders; public SettingValueProviderManager( IServiceProvider serviceProvider, - IOptions options) + IOptions options) { Options = options.Value; diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs index 09a50daa5d..0ada68f0e4 100644 --- a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs +++ b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.Settings { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.ValueProviders.Add(); }); From 81a01ee8d2e05e509958d041c22512fe4cbfefc7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:29:51 +0300 Subject: [PATCH 26/96] DistributedCacheOptions to AbpDistributedCacheOptions --- ...stributedCacheOptions.cs => AbpDistributedCacheOptions.cs} | 2 +- .../src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename framework/src/Volo.Abp.Caching/Volo/Abp/Caching/{DistributedCacheOptions.cs => AbpDistributedCacheOptions.cs} (82%) diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCacheOptions.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs similarity index 82% rename from framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCacheOptions.cs rename to framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs index 36a465ebaa..7f79d0f001 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCacheOptions.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Caching { - public class DistributedCacheOptions + public class AbpDistributedCacheOptions { /// /// Throw or hide exceptions for the distributed cache. diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs index 7db967d38b..990d4e4ef7 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs @@ -38,11 +38,11 @@ namespace Volo.Abp.Caching private readonly AbpCacheOptions _cacheOption; - private readonly DistributedCacheOptions _distributedCacheOption; + private readonly AbpDistributedCacheOptions _distributedCacheOption; public DistributedCache( IOptions cacheOption, - IOptions distributedCacheOption, + IOptions distributedCacheOption, IDistributedCache cache, ICancellationTokenProvider cancellationTokenProvider, IDistributedCacheSerializer serializer, From c5640700dd2f5d8e56743ff9ff7f77c1a44a54c9 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:31:47 +0300 Subject: [PATCH 27/96] RabbitMqEventBusOptions to AbpRabbitMqEventBusOptions --- .../RabbitMq/AbpEventBusRabbitMqModule.cs | 2 +- ...ptions.cs => AbpRabbitMqEventBusOptions.cs} | 2 +- .../RabbitMq/RabbitMqDistributedEventBus.cs | 18 +++++++++--------- samples/RabbitMqEventBus/App1/App1Module.cs | 2 +- samples/RabbitMqEventBus/App2/App2Module.cs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) rename framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/{RabbitMqEventBusOptions.cs => AbpRabbitMqEventBusOptions.cs} (82%) diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpEventBusRabbitMqModule.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpEventBusRabbitMqModule.cs index f13f1ae2fe..f2dbde18b2 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpEventBusRabbitMqModule.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpEventBusRabbitMqModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.EventBus.RabbitMq { var configuration = context.Services.GetConfiguration(); - Configure(configuration.GetSection("RabbitMQ:EventBus")); + Configure(configuration.GetSection("RabbitMQ:EventBus")); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqEventBusOptions.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs similarity index 82% rename from framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqEventBusOptions.cs rename to framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs index 5a92a07869..f91ca91c89 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqEventBusOptions.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/AbpRabbitMqEventBusOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.EventBus.RabbitMq { - public class RabbitMqEventBusOptions + public class AbpRabbitMqEventBusOptions { public string ConnectionName { get; set; } diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs index ad8643ebae..04e72af0d0 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.EventBus.RabbitMq [ExposeServices(typeof(IDistributedEventBus), typeof(RabbitMqDistributedEventBus))] public class RabbitMqDistributedEventBus : EventBusBase, IDistributedEventBus, ISingletonDependency { - protected RabbitMqEventBusOptions RabbitMqEventBusOptions { get; } + protected AbpRabbitMqEventBusOptions AbpRabbitMqEventBusOptions { get; } protected DistributedEventBusOptions DistributedEventBusOptions { get; } protected IConnectionPool ConnectionPool { get; } protected IRabbitMqSerializer Serializer { get; } @@ -34,7 +34,7 @@ namespace Volo.Abp.EventBus.RabbitMq protected IRabbitMqMessageConsumer Consumer { get; private set; } public RabbitMqDistributedEventBus( - IOptions options, + IOptions options, IConnectionPool connectionPool, IRabbitMqSerializer serializer, IServiceScopeFactory serviceScopeFactory, @@ -46,7 +46,7 @@ namespace Volo.Abp.EventBus.RabbitMq Serializer = serializer; MessageConsumerFactory = messageConsumerFactory; DistributedEventBusOptions = distributedEventBusOptions.Value; - RabbitMqEventBusOptions = options.Value; + AbpRabbitMqEventBusOptions = options.Value; HandlerFactories = new ConcurrentDictionary>(); EventTypes = new ConcurrentDictionary(); @@ -56,17 +56,17 @@ namespace Volo.Abp.EventBus.RabbitMq { Consumer = MessageConsumerFactory.Create( new ExchangeDeclareConfiguration( - RabbitMqEventBusOptions.ExchangeName, + AbpRabbitMqEventBusOptions.ExchangeName, type: "direct", durable: true ), new QueueDeclareConfiguration( - RabbitMqEventBusOptions.ClientName, + AbpRabbitMqEventBusOptions.ClientName, durable: true, exclusive: false, autoDelete: false ), - RabbitMqEventBusOptions.ConnectionName + AbpRabbitMqEventBusOptions.ConnectionName ); Consumer.OnMessageReceived(ProcessEventAsync); @@ -171,10 +171,10 @@ namespace Volo.Abp.EventBus.RabbitMq var eventName = EventNameAttribute.GetNameOrDefault(eventType); var body = Serializer.Serialize(eventData); - using (var channel = ConnectionPool.Get(RabbitMqEventBusOptions.ConnectionName).CreateModel()) + using (var channel = ConnectionPool.Get(AbpRabbitMqEventBusOptions.ConnectionName).CreateModel()) { channel.ExchangeDeclare( - RabbitMqEventBusOptions.ExchangeName, + AbpRabbitMqEventBusOptions.ExchangeName, "direct", durable: true ); @@ -183,7 +183,7 @@ namespace Volo.Abp.EventBus.RabbitMq properties.DeliveryMode = RabbitMqConsts.DeliveryModes.Persistent; channel.BasicPublish( - exchange: RabbitMqEventBusOptions.ExchangeName, + exchange: AbpRabbitMqEventBusOptions.ExchangeName, routingKey: eventName, mandatory: true, basicProperties: properties, diff --git a/samples/RabbitMqEventBus/App1/App1Module.cs b/samples/RabbitMqEventBus/App1/App1Module.cs index 0aa34b5347..d6fff8f7e2 100644 --- a/samples/RabbitMqEventBus/App1/App1Module.cs +++ b/samples/RabbitMqEventBus/App1/App1Module.cs @@ -12,7 +12,7 @@ namespace App1 { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.ClientName = "TestApp1"; options.ExchangeName = "TestMessages"; diff --git a/samples/RabbitMqEventBus/App2/App2Module.cs b/samples/RabbitMqEventBus/App2/App2Module.cs index 2163a21544..1c35ce9cd9 100644 --- a/samples/RabbitMqEventBus/App2/App2Module.cs +++ b/samples/RabbitMqEventBus/App2/App2Module.cs @@ -12,7 +12,7 @@ namespace App2 { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.ClientName = "TestApp2"; options.ExchangeName = "TestMessages"; From 45e27cd85f56bc69433818e79a4478154b4643fc Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:33:48 +0300 Subject: [PATCH 28/96] IdentityClientOptions to AbpIdentityClientOptions --- .../{IdentityClientOptions.cs => AbpIdentityClientOptions.cs} | 4 ++-- .../Volo/Abp/IdentityModel/AbpIdentityModelModule.cs | 2 +- .../Abp/IdentityModel/IdentityModelAuthenticationService.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/{IdentityClientOptions.cs => AbpIdentityClientOptions.cs} (72%) diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientOptions.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityClientOptions.cs similarity index 72% rename from framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientOptions.cs rename to framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityClientOptions.cs index f05d5c8511..0e877ee441 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientOptions.cs +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityClientOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.IdentityModel { - public class IdentityClientOptions + public class AbpIdentityClientOptions { public IdentityClientConfigurationDictionary IdentityClients { get; set; } - public IdentityClientOptions() + public AbpIdentityClientOptions() { IdentityClients = new IdentityClientConfigurationDictionary(); } diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityModelModule.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityModelModule.cs index b8578ca95d..b26b545fec 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityModelModule.cs +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/AbpIdentityModelModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.IdentityModel { var configuration = context.Services.GetConfiguration(); - Configure(configuration); + Configure(configuration); } } } diff --git a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs index 681b65bcd9..ca6e41d60d 100644 --- a/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs +++ b/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs @@ -19,11 +19,11 @@ namespace Volo.Abp.IdentityModel public class IdentityModelAuthenticationService : IIdentityModelAuthenticationService, ITransientDependency { public ILogger Logger { get; set; } - protected IdentityClientOptions ClientOptions { get; } + protected AbpIdentityClientOptions ClientOptions { get; } protected ICancellationTokenProvider CancellationTokenProvider { get; } public IdentityModelAuthenticationService( - IOptions options, + IOptions options, ICancellationTokenProvider cancellationTokenProvider) { CancellationTokenProvider = cancellationTokenProvider; From e0bfc969c5ac852faba985f9a1f1e898d284ad24 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:34:42 +0300 Subject: [PATCH 29/96] ModuleLifecycleOptions to AbpModuleLifecycleOptions --- .../Volo/Abp/Internal/InternalServiceCollectionExtensions.cs | 2 +- ...ModuleLifecycleOptions.cs => AbpModuleLifecycleOptions.cs} | 4 ++-- .../src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename framework/src/Volo.Abp.Core/Volo/Abp/Modularity/{ModuleLifecycleOptions.cs => AbpModuleLifecycleOptions.cs} (74%) diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs index 609328216e..7407f67bd6 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs @@ -43,7 +43,7 @@ namespace Volo.Abp.Internal services.AddAssemblyOf(); - services.Configure(options => + services.Configure(options => { options.Contributors.Add(); options.Contributors.Add(); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleLifecycleOptions.cs similarity index 74% rename from framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleLifecycleOptions.cs index 8136a32677..3ea260c633 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleLifecycleOptions.cs @@ -2,11 +2,11 @@ namespace Volo.Abp.Modularity { - public class ModuleLifecycleOptions + public class AbpModuleLifecycleOptions { public ITypeList Contributors { get; } - public ModuleLifecycleOptions() + public AbpModuleLifecycleOptions() { Contributors = new TypeList(); } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs index 934948dc03..8f25389b63 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs @@ -17,7 +17,7 @@ namespace Volo.Abp.Modularity public ModuleManager( IModuleContainer moduleContainer, ILogger logger, - IOptions options, + IOptions options, IServiceProvider serviceProvider) { _moduleContainer = moduleContainer; From 3946aa43115ce6507b9710fb2016cb2008a65269 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:36:30 +0300 Subject: [PATCH 30/96] BundleContributorOptions to AbpBundleContributorOptions --- ...leContributorOptions.cs => AbpBundleContributorOptions.cs} | 4 ++-- .../Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs | 4 ++-- modules/docs/src/Volo.Docs.Web/DocsWebModule.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/{BundleContributorOptions.cs => AbpBundleContributorOptions.cs} (90%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpBundleContributorOptions.cs similarity index 90% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpBundleContributorOptions.cs index 1e7d15bf23..1a95c3c98b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpBundleContributorOptions.cs @@ -4,11 +4,11 @@ using JetBrains.Annotations; namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling { - public class BundleContributorOptions + public class AbpBundleContributorOptions { public ConcurrentDictionary AllExtensions { get; } - public BundleContributorOptions() + public AbpBundleContributorOptions() { AllExtensions = new ConcurrentDictionary(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs index 653794bda8..2d38b95233 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling public ILogger Logger { get; set; } protected readonly BundlingOptions Options; - protected readonly BundleContributorOptions ContributorOptions; + protected readonly AbpBundleContributorOptions ContributorOptions; protected readonly IWebContentFileProvider WebContentFileProvider; protected readonly IWebHostEnvironment HostingEnvironment; protected readonly IScriptBundler ScriptBundler; @@ -34,7 +34,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling public BundleManager( IOptions options, - IOptions contributorOptions, + IOptions contributorOptions, IScriptBundler scriptBundler, IStyleBundler styleBundler, IWebHostEnvironment hostingEnvironment, diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs index 3f3e87ea14..5a1b7d5f94 100644 --- a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs +++ b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs @@ -68,7 +68,7 @@ namespace Volo.Docs options.Converters[MarkdownDocumentToHtmlConverter.Type] = typeof(MarkdownDocumentToHtmlConverter); }); - Configure(options => + Configure(options => { options .Extensions() From 8b58991ff3204873567b322b39d8dc8a5b2dc70d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:37:28 +0300 Subject: [PATCH 31/96] DistributedEventBusOptions to AbpDistributedEventBusOptions --- .../Entities/Events/Distributed/EntityToEtoMapper.cs | 4 ++-- .../Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs | 8 ++++---- .../Volo/Abp/EventBus/AbpEventBusModule.cs | 2 +- ...ventBusOptions.cs => AbpDistributedEventBusOptions.cs} | 4 ++-- .../Abp/EventBus/Distributed/LocalDistributedEventBus.cs | 6 +++--- .../Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs | 2 +- .../Volo/Abp/Identity/AbpIdentityDomainModule.cs | 2 +- .../Abp/Identity/Distributed_User_Change_Event_Tests.cs | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/{DistributedEventBusOptions.cs => AbpDistributedEventBusOptions.cs} (77%) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs index b15ea3d6a4..24a757fb08 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Events/Distributed/EntityToEtoMapper.cs @@ -11,10 +11,10 @@ namespace Volo.Abp.Domain.Entities.Events.Distributed public class EntityToEtoMapper : IEntityToEtoMapper, ITransientDependency { protected IHybridServiceScopeFactory HybridServiceScopeFactory { get; } - protected DistributedEventBusOptions Options { get; } + protected AbpDistributedEventBusOptions Options { get; } public EntityToEtoMapper( - IOptions options, + IOptions options, IHybridServiceScopeFactory hybridServiceScopeFactory) { HybridServiceScopeFactory = hybridServiceScopeFactory; diff --git a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs index 04e72af0d0..c530437e6f 100644 --- a/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus.RabbitMQ/Volo/Abp/EventBus/RabbitMq/RabbitMqDistributedEventBus.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.EventBus.RabbitMq public class RabbitMqDistributedEventBus : EventBusBase, IDistributedEventBus, ISingletonDependency { protected AbpRabbitMqEventBusOptions AbpRabbitMqEventBusOptions { get; } - protected DistributedEventBusOptions DistributedEventBusOptions { get; } + protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; } protected IConnectionPool ConnectionPool { get; } protected IRabbitMqSerializer Serializer { get; } @@ -38,14 +38,14 @@ namespace Volo.Abp.EventBus.RabbitMq IConnectionPool connectionPool, IRabbitMqSerializer serializer, IServiceScopeFactory serviceScopeFactory, - IOptions distributedEventBusOptions, + IOptions distributedEventBusOptions, IRabbitMqMessageConsumerFactory messageConsumerFactory) : base(serviceScopeFactory) { ConnectionPool = connectionPool; Serializer = serializer; MessageConsumerFactory = messageConsumerFactory; - DistributedEventBusOptions = distributedEventBusOptions.Value; + AbpDistributedEventBusOptions = distributedEventBusOptions.Value; AbpRabbitMqEventBusOptions = options.Value; HandlerFactories = new ConcurrentDictionary>(); @@ -71,7 +71,7 @@ namespace Volo.Abp.EventBus.RabbitMq Consumer.OnMessageReceived(ProcessEventAsync); - SubscribeHandlers(DistributedEventBusOptions.Handlers); + SubscribeHandlers(AbpDistributedEventBusOptions.Handlers); } private async Task ProcessEventAsync(IModel channel, BasicDeliverEventArgs ea) diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs index 3729b48b61..15f8bd8a3e 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs @@ -37,7 +37,7 @@ namespace Volo.Abp.EventBus options.Handlers.AddIfNotContains(localHandlers); }); - services.Configure(options => + services.Configure(options => { options.Handlers.AddIfNotContains(distributedHandlers); }); diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/DistributedEventBusOptions.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs similarity index 77% rename from framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/DistributedEventBusOptions.cs rename to framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs index 045efe9d02..1d1d7768f2 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/DistributedEventBusOptions.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/AbpDistributedEventBusOptions.cs @@ -2,12 +2,12 @@ using Volo.Abp.Collections; namespace Volo.Abp.EventBus.Distributed { - public class DistributedEventBusOptions + public class AbpDistributedEventBusOptions { public ITypeList Handlers { get; } public EtoMappingDictionary EtoMappings { get; set; } - public DistributedEventBusOptions() + public AbpDistributedEventBusOptions() { Handlers = new TypeList(); EtoMappings = new EtoMappingDictionary(); diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs index a50cdc2d70..0d0ea6b107 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus.cs @@ -17,16 +17,16 @@ namespace Volo.Abp.EventBus.Distributed protected IServiceScopeFactory ServiceScopeFactory { get; } - protected DistributedEventBusOptions DistributedEventBusOptions { get; } + protected AbpDistributedEventBusOptions AbpDistributedEventBusOptions { get; } public LocalDistributedEventBus( ILocalEventBus localEventBus, IServiceScopeFactory serviceScopeFactory, - IOptions distributedEventBusOptions) + IOptions distributedEventBusOptions) { _localEventBus = localEventBus; ServiceScopeFactory = serviceScopeFactory; - DistributedEventBusOptions = distributedEventBusOptions.Value; + AbpDistributedEventBusOptions = distributedEventBusOptions.Value; Subscribe(distributedEventBusOptions.Value.Handlers); } diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs index aea5013fef..b9aef1ca2e 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs @@ -44,7 +44,7 @@ namespace Volo.Abp.TestApp private void ConfigureDistributedEventBus() { - Configure(options => + Configure(options => { options.EtoMappings.Add(); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs index 938b4050d7..1bb065017e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.Identity { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.EtoMappings.Add(); }); diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/Distributed_User_Change_Event_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/Distributed_User_Change_Event_Tests.cs index bc6a8cd27b..95e8f925c4 100644 --- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/Distributed_User_Change_Event_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/Distributed_User_Change_Event_Tests.cs @@ -30,7 +30,7 @@ namespace Volo.Abp.Identity [Fact] public async Task Should_Register_Handler() { - var options = GetRequiredService>().Value; + var options = GetRequiredService>().Value; options.EtoMappings.ShouldContain(m => m.Key == typeof(IdentityUser) && m.Value.EtoType == typeof(UserEto)); options.Handlers.ShouldContain(h => h == typeof(DistributedUserUpdateHandler)); } From 6a3130dec43ea5a04839d7d8b1b2d251c2ec670b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:39:46 +0300 Subject: [PATCH 32/96] LocalEventBusOptions to AbpLocalEventBusOptions --- .../Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs | 2 +- .../{LocalEventBusOptions.cs => AbpLocalEventBusOptions.cs} | 4 ++-- .../Volo/Abp/EventBus/Local/LocalEventBus.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/{LocalEventBusOptions.cs => AbpLocalEventBusOptions.cs} (71%) diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs index 15f8bd8a3e..c5a5022f77 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/AbpEventBusModule.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.EventBus } }); - services.Configure(options => + services.Configure(options => { options.Handlers.AddIfNotContains(localHandlers); }); diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBusOptions.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/AbpLocalEventBusOptions.cs similarity index 71% rename from framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBusOptions.cs rename to framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/AbpLocalEventBusOptions.cs index 24606a119a..2d47a2bcce 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBusOptions.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/AbpLocalEventBusOptions.cs @@ -2,11 +2,11 @@ using Volo.Abp.Collections; namespace Volo.Abp.EventBus.Local { - public class LocalEventBusOptions + public class AbpLocalEventBusOptions { public ITypeList Handlers { get; } - public LocalEventBusOptions() + public AbpLocalEventBusOptions() { Handlers = new TypeList(); } diff --git a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs index 775e89a6fa..7db5c18f01 100644 --- a/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs +++ b/framework/src/Volo.Abp.EventBus/Volo/Abp/EventBus/Local/LocalEventBus.cs @@ -23,12 +23,12 @@ namespace Volo.Abp.EventBus.Local /// public ILogger Logger { get; set; } - protected LocalEventBusOptions Options { get; } + protected AbpLocalEventBusOptions Options { get; } protected ConcurrentDictionary> HandlerFactories { get; } public LocalEventBus( - IOptions options, + IOptions options, IServiceScopeFactory serviceScopeFactory) : base(serviceScopeFactory) { From 8146c20a57e56cd81899321c1eb71c521cc18f99 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:43:02 +0300 Subject: [PATCH 33/96] CommonDbContextRegistrationOptions to AbpCommonDbContextRegistrationOptions --- ...> AbpCommonDbContextRegistrationOptions.cs} | 18 +++++++++--------- ...mmonDbContextRegistrationOptionsBuilder.cs} | 16 ++++++++-------- .../Repositories/RepositoryRegistrarBase.cs | 2 +- .../AbpDbContextRegistrationOptions.cs | 2 +- .../IAbpDbContextRegistrationOptionsBuilder.cs | 2 +- ...emoryDbContextRegistrationOptionsBuilder.cs | 2 +- .../MemoryDbContextRegistrationOptions.cs | 2 +- ...MongoDbContextRegistrationOptionsBuilder.cs | 2 +- .../MongoDbContextRegistrationOptions.cs | 2 +- .../RepositoryRegistration_Tests.cs | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) rename framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/{CommonDbContextRegistrationOptions.cs => AbpCommonDbContextRegistrationOptions.cs} (81%) rename framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/{ICommonDbContextRegistrationOptionsBuilder.cs => IAbpCommonDbContextRegistrationOptionsBuilder.cs} (74%) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs similarity index 81% rename from framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs index b4ce91d615..c7f7230710 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.DependencyInjection /// /// This is a base class for dbcoUse derived /// - public abstract class CommonDbContextRegistrationOptions : ICommonDbContextRegistrationOptionsBuilder + public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContextRegistrationOptionsBuilder { public Type OriginalDbContextType { get; } @@ -31,7 +31,7 @@ namespace Volo.Abp.DependencyInjection public bool SpecifiedDefaultRepositoryTypes => DefaultRepositoryImplementationType != null && DefaultRepositoryImplementationTypeWithoutKey != null; - protected CommonDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) + protected AbpCommonDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) { OriginalDbContextType = originalDbContextType; Services = services; @@ -40,12 +40,12 @@ namespace Volo.Abp.DependencyInjection ReplacedDbContextTypes = new List(); } - public ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext() + public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext() { return ReplaceDbContext(typeof(TOtherDbContext)); } - public ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType) + public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType) { if (!otherDbContextType.IsAssignableFrom(OriginalDbContextType)) { @@ -57,7 +57,7 @@ namespace Volo.Abp.DependencyInjection return this; } - public ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) + public IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) { RegisterDefaultRepositories = true; IncludeAllEntitiesForDefaultRepositories = includeAllEntities; @@ -65,7 +65,7 @@ namespace Volo.Abp.DependencyInjection return this; } - public ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false) + public IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false) { if (!defaultRepositoryDbContextType.IsAssignableFrom(OriginalDbContextType)) { @@ -77,19 +77,19 @@ namespace Volo.Abp.DependencyInjection return AddDefaultRepositories(includeAllEntities); } - public ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) + public IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) { return AddDefaultRepositories(typeof(TDefaultRepositoryDbContext), includeAllEntities); } - public ICommonDbContextRegistrationOptionsBuilder AddRepository() + public IAbpCommonDbContextRegistrationOptionsBuilder AddRepository() { AddCustomRepository(typeof(TEntity), typeof(TRepository)); return this; } - public ICommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses( + public IAbpCommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses( Type repositoryImplementationType, Type repositoryImplementationTypeWithoutKey ) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs similarity index 74% rename from framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs index 32403707c2..368fa2dc96 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; namespace Volo.Abp.DependencyInjection { - public interface ICommonDbContextRegistrationOptionsBuilder + public interface IAbpCommonDbContextRegistrationOptionsBuilder { IServiceCollection Services { get; } @@ -15,7 +15,7 @@ namespace Volo.Abp.DependencyInjection /// Registers repositories only for aggregate root entities by default. /// set to true to include all entities. /// - ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); + IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); /// /// Registers default repositories for this DbContext. @@ -26,7 +26,7 @@ namespace Volo.Abp.DependencyInjection /// Registers repositories only for aggregate root entities by default. /// set to true to include all entities. /// - ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); + IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); /// /// Registers default repositories for this DbContext. @@ -37,7 +37,7 @@ namespace Volo.Abp.DependencyInjection /// Registers repositories only for aggregate root entities by default. /// set to true to include all entities. /// - ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false); + IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false); /// /// Registers custom repository for a specific entity. @@ -45,7 +45,7 @@ namespace Volo.Abp.DependencyInjection /// /// Entity type /// Repository type - ICommonDbContextRegistrationOptionsBuilder AddRepository(); + IAbpCommonDbContextRegistrationOptionsBuilder AddRepository(); /// /// Uses given class(es) for default repositories. @@ -53,18 +53,18 @@ namespace Volo.Abp.DependencyInjection /// Repository implementation type /// Repository implementation type (without primary key) /// - ICommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses([NotNull] Type repositoryImplementationType, [NotNull] Type repositoryImplementationTypeWithoutKey); + IAbpCommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses([NotNull] Type repositoryImplementationType, [NotNull] Type repositoryImplementationTypeWithoutKey); /// /// Replaces given DbContext type with this DbContext type. /// /// The DbContext type to be replaced - ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext(); + IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(); /// /// Replaces given DbContext type with this DbContext type. /// /// The DbContext type to be replaced - ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType); + IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs index 3ffe507d29..f3b2fc388f 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs @@ -7,7 +7,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.Domain.Repositories { public abstract class RepositoryRegistrarBase - where TOptions: CommonDbContextRegistrationOptions + where TOptions: AbpCommonDbContextRegistrationOptions { public TOptions Options { get; } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs index be5f504ffd..50f2a4bce5 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { - public class AbpDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder + public class AbpDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder { public Dictionary EntityOptions { get; } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs index d72bbe414f..b2eb839944 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs @@ -5,7 +5,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { - public interface IAbpDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder + public interface IAbpDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { void Entity([NotNull] Action> optionsAction) where TEntity : IEntity; diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs index 27081fe83c..74eb0317f7 100644 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs @@ -2,7 +2,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MemoryDb.DependencyInjection { - public interface IMemoryDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder + public interface IMemoryDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { } diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs index d3380ffc41..a605576bbd 100644 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs @@ -4,7 +4,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MemoryDb.DependencyInjection { - public class MemoryDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IMemoryDbContextRegistrationOptionsBuilder + public class MemoryDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IMemoryDbContextRegistrationOptionsBuilder { public MemoryDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services) diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs index 6504639862..0e82c8755c 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs @@ -2,7 +2,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MongoDB.DependencyInjection { - public interface IMongoDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder + public interface IMongoDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { } diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs index bc748e12e9..2915a3ccdd 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs @@ -4,7 +4,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MongoDB.DependencyInjection { - public class MongoDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IMongoDbContextRegistrationOptionsBuilder + public class MongoDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IMongoDbContextRegistrationOptionsBuilder { public MongoDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services) diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs index 24f14ddf6e..820a62892e 100644 --- a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs +++ b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs @@ -187,9 +187,9 @@ namespace Volo.Abp.Domain.Repositories services.ShouldContainTransient(typeof(IRepository), typeof(MyTestCustomBaseRepository)); } - public class MyTestRepositoryRegistrar : RepositoryRegistrarBase + public class MyTestRepositoryRegistrar : RepositoryRegistrarBase { - public MyTestRepositoryRegistrar(CommonDbContextRegistrationOptions options) + public MyTestRepositoryRegistrar(AbpCommonDbContextRegistrationOptions options) : base(options) { } @@ -331,7 +331,7 @@ namespace Volo.Abp.Domain.Repositories } - public class TestDbContextRegistrationOptions : CommonDbContextRegistrationOptions + public class TestDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions { public TestDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services) From 9b6b49ff2df79d093a7cfd15059210b0c9b8c525 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:45:50 +0300 Subject: [PATCH 34/96] BackgroundJobs To AbpBackgroundJobs --- ...dJobOptions.cs => AbpBackgroundJobOptions.cs} | 4 ++-- .../AbpBackgroundJobsAbstractionsModule.cs | 2 +- .../Abp/BackgroundJobs/BackgroundJobExecuter.cs | 4 ++-- .../Hangfire/HangfireJobExecutionAdapter.cs | 4 ++-- .../Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs | 16 ++++++++-------- .../BackgroundJobs/RabbitMQ/JobQueueManager.cs | 4 ++-- .../BackgroundJobs/AbpBackgroundJobsModule.cs | 2 +- .../Abp/BackgroundJobs/BackgroundJobWorker.cs | 4 ++-- .../Volo/Abp/Emailing/AbpEmailingModule.cs | 2 +- .../BackgroundJobsTestBaseModule.cs | 2 +- .../BookStoreDbMigratorModule.cs | 2 +- .../BookStoreTestBaseModule.cs | 2 +- .../BookStoreDbMigratorModule.cs | 2 +- .../BookStoreTestBaseModule.cs | 2 +- .../BookStoreTestBaseModule.cs | 2 +- .../DashboardDemoTestBaseModule.cs | 2 +- .../MyProjectNameDbMigratorModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameTestBaseModule.cs | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) rename framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/{BackgroundJobOptions.cs => AbpBackgroundJobOptions.cs} (96%) diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobOptions.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobOptions.cs similarity index 96% rename from framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobOptions.cs rename to framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobOptions.cs index 0b058756c0..a16bc418a7 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobOptions.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobOptions.cs @@ -4,7 +4,7 @@ using System.Collections.Immutable; namespace Volo.Abp.BackgroundJobs { - public class BackgroundJobOptions + public class AbpBackgroundJobOptions { private readonly Dictionary _jobConfigurationsByArgsType; private readonly Dictionary _jobConfigurationsByName; @@ -15,7 +15,7 @@ namespace Volo.Abp.BackgroundJobs /// public bool IsJobExecutionEnabled { get; set; } = true; - public BackgroundJobOptions() + public AbpBackgroundJobOptions() { _jobConfigurationsByArgsType = new Dictionary(); _jobConfigurationsByName = new Dictionary(); diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobsAbstractionsModule.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobsAbstractionsModule.cs index 224c9b1d2c..38a0afb2cd 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobsAbstractionsModule.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/AbpBackgroundJobsAbstractionsModule.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.BackgroundJobs } }); - services.Configure(options => + services.Configure(options => { foreach (var jobType in jobTypes) { diff --git a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs index 59352bc892..df0ec36dd6 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.Abstractions/Volo/Abp/BackgroundJobs/BackgroundJobExecuter.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.BackgroundJobs { public ILogger Logger { protected get; set; } - protected BackgroundJobOptions Options { get; } + protected AbpBackgroundJobOptions Options { get; } - public BackgroundJobExecuter(IOptions options) + public BackgroundJobExecuter(IOptions options) { Options = options.Value; diff --git a/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireJobExecutionAdapter.cs b/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireJobExecutionAdapter.cs index 96c3b1ee0b..4a61aa2845 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireJobExecutionAdapter.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.HangFire/Volo/Abp/BackgroundJobs/Hangfire/HangfireJobExecutionAdapter.cs @@ -5,12 +5,12 @@ namespace Volo.Abp.BackgroundJobs.Hangfire { public class HangfireJobExecutionAdapter { - protected BackgroundJobOptions Options { get; } + protected AbpBackgroundJobOptions Options { get; } protected IServiceScopeFactory ServiceScopeFactory { get; } protected IBackgroundJobExecuter JobExecuter { get; } public HangfireJobExecutionAdapter( - IOptions options, + IOptions options, IBackgroundJobExecuter jobExecuter, IServiceScopeFactory serviceScopeFactory) { diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs index 8d7012bde1..6979d76999 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs @@ -24,7 +24,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ public ILogger> Logger { get; set; } - protected BackgroundJobOptions BackgroundJobOptions { get; } + protected AbpBackgroundJobOptions AbpBackgroundJobOptions { get; } protected RabbitMqBackgroundJobOptions RabbitMqBackgroundJobOptions { get; } protected IChannelPool ChannelPool { get; } protected IRabbitMqSerializer Serializer { get; } @@ -35,21 +35,21 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ protected bool IsDiposed { get; private set; } public JobQueue( - IOptions backgroundJobOptions, - IOptions rabbitMqBackgroundJobOptions, + IOptions backgroundJobOptions, + IOptions rabbitMqAbpBackgroundJobOptions, IChannelPool channelPool, IRabbitMqSerializer serializer, IBackgroundJobExecuter jobExecuter, IServiceScopeFactory serviceScopeFactory) { - BackgroundJobOptions = backgroundJobOptions.Value; - RabbitMqBackgroundJobOptions = rabbitMqBackgroundJobOptions.Value; + AbpBackgroundJobOptions = backgroundJobOptions.Value; + RabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value; Serializer = serializer; JobExecuter = jobExecuter; ServiceScopeFactory = serviceScopeFactory; ChannelPool = channelPool; - JobConfiguration = BackgroundJobOptions.GetJob(typeof(TArgs)); + JobConfiguration = AbpBackgroundJobOptions.GetJob(typeof(TArgs)); QueueConfiguration = GetOrCreateJobQueueConfiguration(); Logger = NullLogger>.Instance; @@ -85,7 +85,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ { CheckDisposed(); - if (!BackgroundJobOptions.IsJobExecutionEnabled) + if (!AbpBackgroundJobOptions.IsJobExecutionEnabled) { return; } @@ -129,7 +129,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ var result = QueueConfiguration.Declare(ChannelAccessor.Channel); Logger.LogDebug($"RabbitMQ Queue '{QueueConfiguration.QueueName}' has {result.MessageCount} messages and {result.ConsumerCount} consumers."); - if (BackgroundJobOptions.IsJobExecutionEnabled) + if (AbpBackgroundJobOptions.IsJobExecutionEnabled) { Consumer = new EventingBasicConsumer(ChannelAccessor.Channel); Consumer.Received += MessageReceived; diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueManager.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueManager.cs index 7ffe9ec82a..73b7c21d2a 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueManager.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueueManager.cs @@ -15,10 +15,10 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ protected IServiceProvider ServiceProvider { get; } - protected BackgroundJobOptions Options { get; } + protected AbpBackgroundJobOptions Options { get; } public JobQueueManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider) { ServiceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs index f0324a9932..cea8a1eee6 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobsModule.cs @@ -17,7 +17,7 @@ namespace Volo.Abp.BackgroundJobs { public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; + var options = context.ServiceProvider.GetRequiredService>().Value; if (options.IsJobExecutionEnabled) { context.ServiceProvider diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs index 4c9efbe6d8..f0ae29351c 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.BackgroundJobs { public class BackgroundJobWorker : PeriodicBackgroundWorkerBase, IBackgroundJobWorker { - protected BackgroundJobOptions JobOptions { get; } + protected AbpBackgroundJobOptions JobOptions { get; } protected BackgroundJobWorkerOptions WorkerOptions { get; } @@ -19,7 +19,7 @@ namespace Volo.Abp.BackgroundJobs public BackgroundJobWorker( AbpTimer timer, - IOptions jobOptions, + IOptions jobOptions, IOptions workerOptions, IServiceScopeFactory serviceScopeFactory) : base(timer) diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs index 2d739c9fae..ae8490c871 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs @@ -30,7 +30,7 @@ namespace Volo.Abp.Emailing options.FileSets.AddEmbedded(); }); - Configure(options => + Configure(options => { options.AddJob(); }); diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs index d38b3ceac5..5af07bd6dc 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.BackgroundJobs { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs index 732d8f0e6b..f1977a63ad 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs @@ -14,7 +14,7 @@ namespace Acme.BookStore.DbMigrator { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => options.IsJobExecutionEnabled = false); + Configure(options => options.IsJobExecutionEnabled = false); } } } diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs index 3674dd6503..01d9dd7d63 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs @@ -19,7 +19,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs index 93309506ea..6938a9ae92 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.DbMigrator/BookStoreDbMigratorModule.cs @@ -14,7 +14,7 @@ namespace Acme.BookStore.DbMigrator { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => options.IsJobExecutionEnabled = false); + Configure(options => options.IsJobExecutionEnabled = false); } } } diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs index 3674dd6503..01d9dd7d63 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs @@ -19,7 +19,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); diff --git a/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs b/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs index 3674dd6503..01d9dd7d63 100644 --- a/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs +++ b/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBaseModule.cs @@ -19,7 +19,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); diff --git a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBaseModule.cs b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBaseModule.cs index ae71a07e97..2156c6da13 100644 --- a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBaseModule.cs +++ b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBaseModule.cs @@ -19,7 +19,7 @@ namespace DashboardDemo { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs index 52b02ed18c..ed9e67651c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs @@ -14,7 +14,7 @@ namespace MyCompanyName.MyProjectName.DbMigrator { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => options.IsJobExecutionEnabled = false); + Configure(options => options.IsJobExecutionEnabled = false); } } } diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index d0e6e40092..c083974f12 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -89,7 +89,7 @@ namespace MyCompanyName.MyProjectName options.Applications["MVC"].RootUrl = configuration["App:SelfUrl"]; }); - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs index 6304627e31..974a91dcf6 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBaseModule.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.IsJobExecutionEnabled = false; }); From 61106bcf270612965a91394031d5b50870116db0 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:49:47 +0300 Subject: [PATCH 35/96] RabbitMqBackgroundJobOptions to AbpRabbitMqBackgroundJobOptions --- ...obOptions.cs => AbpRabbitMqBackgroundJobOptions.cs} | 4 ++-- .../Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/{RabbitMqBackgroundJobOptions.cs => AbpRabbitMqBackgroundJobOptions.cs} (85%) diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/RabbitMqBackgroundJobOptions.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs similarity index 85% rename from framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/RabbitMqBackgroundJobOptions.cs rename to framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs index 95ad677e55..8d588debe9 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/RabbitMqBackgroundJobOptions.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/AbpRabbitMqBackgroundJobOptions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace Volo.Abp.BackgroundJobs.RabbitMQ { - public class RabbitMqBackgroundJobOptions + public class AbpRabbitMqBackgroundJobOptions { /// /// Key: Job Args Type @@ -15,7 +15,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ /// public string DefaultQueueNamePrefix { get; set; } - public RabbitMqBackgroundJobOptions() + public AbpRabbitMqBackgroundJobOptions() { JobQueues = new Dictionary(); DefaultQueueNamePrefix = "AbpBackgroundJobs."; diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs index 6979d76999..f2b00345a1 100644 --- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs +++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ public ILogger> Logger { get; set; } protected AbpBackgroundJobOptions AbpBackgroundJobOptions { get; } - protected RabbitMqBackgroundJobOptions RabbitMqBackgroundJobOptions { get; } + protected AbpRabbitMqBackgroundJobOptions AbpRabbitMqBackgroundJobOptions { get; } protected IChannelPool ChannelPool { get; } protected IRabbitMqSerializer Serializer { get; } protected IBackgroundJobExecuter JobExecuter { get; } @@ -36,14 +36,14 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ public JobQueue( IOptions backgroundJobOptions, - IOptions rabbitMqAbpBackgroundJobOptions, + IOptions rabbitMqAbpBackgroundJobOptions, IChannelPool channelPool, IRabbitMqSerializer serializer, IBackgroundJobExecuter jobExecuter, IServiceScopeFactory serviceScopeFactory) { AbpBackgroundJobOptions = backgroundJobOptions.Value; - RabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value; + AbpRabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value; Serializer = serializer; JobExecuter = jobExecuter; ServiceScopeFactory = serviceScopeFactory; @@ -57,10 +57,10 @@ namespace Volo.Abp.BackgroundJobs.RabbitMQ protected virtual JobQueueConfiguration GetOrCreateJobQueueConfiguration() { - return RabbitMqBackgroundJobOptions.JobQueues.GetOrDefault(typeof(TArgs)) ?? + return AbpRabbitMqBackgroundJobOptions.JobQueues.GetOrDefault(typeof(TArgs)) ?? new JobQueueConfiguration( typeof(TArgs), - RabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName + AbpRabbitMqBackgroundJobOptions.DefaultQueueNamePrefix + JobConfiguration.JobName ); } From bac992b7ef6c3fc149ac6676972d3baed86ff6f2 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:50:50 +0300 Subject: [PATCH 36/96] BackgroundJobWorkerOptions to AbpBackgroundJobWorkerOptions --- ...ndJobWorkerOptions.cs => AbpBackgroundJobWorkerOptions.cs} | 4 ++-- .../Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs | 4 ++-- .../app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/{BackgroundJobWorkerOptions.cs => AbpBackgroundJobWorkerOptions.cs} (93%) diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorkerOptions.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobWorkerOptions.cs similarity index 93% rename from framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorkerOptions.cs rename to framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobWorkerOptions.cs index f89bc40e67..69878d28f2 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorkerOptions.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/AbpBackgroundJobWorkerOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.BackgroundJobs { - public class BackgroundJobWorkerOptions + public class AbpBackgroundJobWorkerOptions { /// /// Interval between polling jobs from . @@ -33,7 +33,7 @@ /// public double DefaultWaitFactor { get; set; } - public BackgroundJobWorkerOptions() + public AbpBackgroundJobWorkerOptions() { MaxJobFetchCount = 1000; JobPollPeriod = 5000; diff --git a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs index f0ae29351c..03b5cb73e4 100644 --- a/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs +++ b/framework/src/Volo.Abp.BackgroundJobs/Volo/Abp/BackgroundJobs/BackgroundJobWorker.cs @@ -13,14 +13,14 @@ namespace Volo.Abp.BackgroundJobs { protected AbpBackgroundJobOptions JobOptions { get; } - protected BackgroundJobWorkerOptions WorkerOptions { get; } + protected AbpBackgroundJobWorkerOptions WorkerOptions { get; } protected IServiceScopeFactory ServiceScopeFactory { get; } public BackgroundJobWorker( AbpTimer timer, IOptions jobOptions, - IOptions workerOptions, + IOptions workerOptions, IServiceScopeFactory serviceScopeFactory) : base(timer) { diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs index cb9b532525..5308053e83 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.BackgroundJobs.DemoApp }); }); - Configure(options => + Configure(options => { //Configure for fast running options.JobPollPeriod = 1000; From cd8e5f0ac0bdbf32dabd26149180fea66dc462eb Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:51:37 +0300 Subject: [PATCH 37/96] BackgroundWorkerOptions to AbpBackgroundWorkerOptions --- ...ckgroundWorkerOptions.cs => AbpBackgroundWorkerOptions.cs} | 2 +- .../Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/{BackgroundWorkerOptions.cs => AbpBackgroundWorkerOptions.cs} (80%) diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerOptions.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkerOptions.cs similarity index 80% rename from framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerOptions.cs rename to framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkerOptions.cs index 6b368f657a..2179880bb1 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkerOptions.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkerOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.BackgroundWorkers { - public class BackgroundWorkerOptions + public class AbpBackgroundWorkerOptions { /// /// Default: true. diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs index 425ffaece0..a11e8a9af9 100644 --- a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs +++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/AbpBackgroundWorkersModule.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.BackgroundWorkers { public override void OnApplicationInitialization(ApplicationInitializationContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; + var options = context.ServiceProvider.GetRequiredService>().Value; if (options.IsEnabled) { AsyncHelper.RunSync( @@ -25,7 +25,7 @@ namespace Volo.Abp.BackgroundWorkers public override void OnApplicationShutdown(ApplicationShutdownContext context) { - var options = context.ServiceProvider.GetRequiredService>().Value; + var options = context.ServiceProvider.GetRequiredService>().Value; if (options.IsEnabled) { AsyncHelper.RunSync( From 2f6eac8c7ca8599e18a530cdba918320878e4dd4 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:53:03 +0300 Subject: [PATCH 38/96] VirtualFileSystemOptions to AbpVirtualFileSystemOptions --- .../AbpIoLocalization/AbpIoLocalizationModule.cs | 2 +- .../AbpAspNetCoreMvcUiBootstrapModule.cs | 2 +- .../MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs | 2 +- .../AbpAspNetCoreMvcUIBasicThemeModule.cs | 2 +- .../AbpAspNetCoreMvcUiThemeSharedModule.cs | 2 +- .../Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs | 2 +- .../Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs | 2 +- .../Volo/Abp/Emailing/AbpEmailingModule.cs | 2 +- .../Volo/Abp/Localization/AbpLocalizationModule.cs | 2 +- .../Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs | 2 +- framework/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs | 2 +- ...ileSystemOptions.cs => AbpVirtualFileSystemOptions.cs} | 4 ++-- .../Volo/Abp/VirtualFileSystem/VirtualFileProvider.cs | 8 ++++---- .../Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs | 2 +- .../Volo/Abp/AspNetCore/AbpAspNetCoreTestModule.cs | 2 +- .../Volo/Abp/Emailing/AbpEmailingTestModule.cs | 2 +- .../Volo/Abp/Localization/AbpLocalization_Tests.cs | 2 +- .../Volo/Abp/Localization/TemplateLocalizer_Tests.cs | 2 +- .../Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs | 2 +- .../Abp/Account/AbpAccountApplicationContractsModule.cs | 2 +- .../Volo/Abp/Account/AbpAccountApplicationModule.cs | 2 +- .../AbpAccountWebIdentityServerModule.cs | 2 +- .../src/Volo.Abp.Account.Web/AbpAccountWebModule.cs | 2 +- .../app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 +- .../Volo/Blogging/BloggingApplicationContractsModule.cs | 2 +- .../Volo/Blogging/BloggingDomainSharedModule.cs | 2 +- .../blogging/src/Volo.Blogging.Web/BloggingWebModule.cs | 2 +- .../ClientSimulationWebModule.cs | 2 +- modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 4 ++-- .../Docs/Admin/DocsAdminApplicationContractsModule.cs | 2 +- .../docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs | 2 +- .../src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs | 2 +- modules/docs/src/Volo.Docs.Web/DocsWebModule.cs | 2 +- .../AbpFeatureManagementApplicationContractsModule.cs | 2 +- .../AbpFeatureManagementDomainSharedModule.cs | 2 +- .../AbpFeatureManagementWebModule.cs | 2 +- .../Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs | 2 +- .../src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs | 2 +- .../IdentityServer/AbpIdentityServerDomainSharedModule.cs | 2 +- 39 files changed, 44 insertions(+), 44 deletions(-) rename framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/{VirtualFileSystemOptions.cs => AbpVirtualFileSystemOptions.cs} (65%) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs index 8a6ca5dfdc..d32497b394 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs @@ -19,7 +19,7 @@ namespace AbpIoLocalization { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("AbpIoLocalization"); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs index d038d64789..889ffdc96e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs index 9a6e12c1ac..ecdaf316e4 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs @@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs index e13857a8db..1d4e99d089 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs @@ -38,7 +38,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic } }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic"); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs index 06c39f9357..e18eafbf57 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs @@ -26,7 +26,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared"); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs index 0d48b5bf95..91ebc02428 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo/Abp/AspNetCore/Mvc/UI/Widgets/AbpAspNetCoreMvcUiWidgetsModule.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Widgets { context.Services.AddTransient(); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs index b7e2b04e5c..515e7a40a1 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs index ae8490c871..55ec63b9ac 100644 --- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs +++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.Emailing public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs index 23de1929d6..60df66feec 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.Localization { AbpStringLocalizerFactory.Replace(context.Services); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp", "Volo/Abp"); }); diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs index 261bd7fe8c..5ee47556c7 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.UI.Navigation { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs b/framework/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs index 0a9206c309..90a9aa45f6 100644 --- a/framework/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs +++ b/framework/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.UI { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileSystemOptions.cs b/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/AbpVirtualFileSystemOptions.cs similarity index 65% rename from framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileSystemOptions.cs rename to framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/AbpVirtualFileSystemOptions.cs index 205d1a57c8..c4a4d203d2 100644 --- a/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileSystemOptions.cs +++ b/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/AbpVirtualFileSystemOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.VirtualFileSystem { - public class VirtualFileSystemOptions + public class AbpVirtualFileSystemOptions { public VirtualFileSetList FileSets { get; } - public VirtualFileSystemOptions() + public AbpVirtualFileSystemOptions() { FileSets = new VirtualFileSetList(); } diff --git a/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileProvider.cs b/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileProvider.cs index be08fc2024..5f90ef7925 100644 --- a/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileProvider.cs +++ b/framework/src/Volo.Abp.VirtualFileSystem/Volo/Abp/VirtualFileSystem/VirtualFileProvider.cs @@ -11,10 +11,10 @@ namespace Volo.Abp.VirtualFileSystem public class VirtualFileProvider : IVirtualFileProvider, ISingletonDependency { private readonly IFileProvider _hybridFileProvider; - private readonly VirtualFileSystemOptions _options; + private readonly AbpVirtualFileSystemOptions _options; public VirtualFileProvider( - IOptions options, + IOptions options, IDynamicFileProvider dynamicFileProvider) { _options = options.Value; @@ -60,10 +60,10 @@ namespace Volo.Abp.VirtualFileSystem { protected override IDictionary Files => _files.Value; - private readonly VirtualFileSystemOptions _options; + private readonly AbpVirtualFileSystemOptions _options; private readonly Lazy> _files; - public InternalVirtualFileProvider(VirtualFileSystemOptions options) + public InternalVirtualFileProvider(AbpVirtualFileSystemOptions options) { _options = options; _files = new Lazy>( diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs index 28b5ee8b1f..97055d1e9a 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs @@ -56,7 +56,7 @@ namespace Volo.Abp.AspNetCore.Mvc }); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestModule.cs index fafd5794a6..d54d392cde 100644 --- a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestModule.cs +++ b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.AspNetCore { var hostingEnvironment = context.Services.GetHostingEnvironment(); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); //options.FileSets.ReplaceEmbeddedByPhysical(FindProjectPath(hostingEnvironment)); diff --git a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs index 2746da3847..e4cdfe0556 100644 --- a/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs +++ b/framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Emailing { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs index 309e317997..eab7a580c5 100644 --- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs +++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs @@ -225,7 +225,7 @@ namespace Volo.Abp.Localization { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TemplateLocalizer_Tests.cs b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TemplateLocalizer_Tests.cs index 9b2366119b..3ba7a2937b 100644 --- a/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TemplateLocalizer_Tests.cs +++ b/framework/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/TemplateLocalizer_Tests.cs @@ -45,7 +45,7 @@ namespace Volo.Abp.Localization { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs index e376d24aa0..e6464f6bd4 100644 --- a/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs +++ b/framework/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs @@ -51,7 +51,7 @@ namespace Volo.Abp.VirtualFileSystem { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.VirtualFileSystem.MyResources"); }); diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs index ad5cb15296..a14a2bce0c 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.Account { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AbpAccountApplicationModule.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AbpAccountApplicationModule.cs index 601ce9a3d3..1f2004ae7e 100644 --- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AbpAccountApplicationModule.cs +++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AbpAccountApplicationModule.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.Account { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/AbpAccountWebIdentityServerModule.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/AbpAccountWebIdentityServerModule.cs index 27e508fcb8..5260554ab5 100644 --- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/AbpAccountWebIdentityServerModule.cs +++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/AbpAccountWebIdentityServerModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.Account.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.Account.Web"); }); diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs index a3b494a264..4d7e41d663 100644 --- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs +++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs @@ -35,7 +35,7 @@ namespace Volo.Abp.Account.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.Account.Web"); }); diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 7a7ecc9046..e6f266a433 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -84,7 +84,7 @@ namespace Volo.BloggingTestApp #endif if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); diff --git a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs index e9ecdbf581..010f872b51 100644 --- a/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs +++ b/modules/blogging/src/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs @@ -12,7 +12,7 @@ namespace Volo.Blogging { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs index e923251245..aaa4425ec7 100644 --- a/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs +++ b/modules/blogging/src/Volo.Blogging.Domain.Shared/Volo/Blogging/BloggingDomainSharedModule.cs @@ -12,7 +12,7 @@ namespace Volo.Blogging { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index aaf3b65f81..b50570a461 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -40,7 +40,7 @@ namespace Volo.Blogging options.MenuContributors.Add(new BloggingMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Blogging"); }); diff --git a/modules/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs b/modules/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs index f4f15c7302..c75ee14656 100644 --- a/modules/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs +++ b/modules/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs @@ -12,7 +12,7 @@ namespace Volo.ClientSimulation { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.ClientSimulation"); }); diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 0766d977c9..54ff29fea1 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -80,7 +80,7 @@ namespace VoloDocs.Web if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar))); @@ -105,7 +105,7 @@ namespace VoloDocs.Web options.CustomSchemaIds(type => type.FullName); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("VoloDocs.Web"); }); diff --git a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs index e37a732a0d..8e2544d632 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs @@ -15,7 +15,7 @@ namespace Volo.Docs.Admin { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs index 34e0272e2f..cb165e3576 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs @@ -41,7 +41,7 @@ namespace Volo.Docs.Admin options.MenuContributors.Add(new DocsMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Docs.Admin"); }); diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs index 8adf03faa9..91618b950a 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/DocsDomainModule.cs @@ -19,7 +19,7 @@ namespace Volo.Docs { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets .AddEmbedded(); diff --git a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs index 5a1b7d5f94..13f29184a9 100644 --- a/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs +++ b/modules/docs/src/Volo.Docs.Web/DocsWebModule.cs @@ -37,7 +37,7 @@ namespace Volo.Docs public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Docs"); }); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs index 732c200bb0..8b71e3f85b 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.FeatureManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs index 95bff48f2e..f91fe28e5f 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain.Shared/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainSharedModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.FeatureManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs index 4908097f36..da39ec3b89 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/AbpFeatureManagementWebModule.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.FeatureManagement public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.FeatureManagement"); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs index 92b99c597f..bdbf5dacb6 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Identity { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs index 91f7b9b3a8..0c4ab84dee 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs @@ -40,7 +40,7 @@ namespace Volo.Abp.Identity.Web options.MenuContributors.Add(new AbpIdentityWebMainMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.Identity.Web"); }); diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs index 8d2bf66576..5cd92d8083 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.IdentityServer { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); From 521b3ac89c020f92496b9cab998b4bbe62daed4e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:54:52 +0300 Subject: [PATCH 39/96] UnitOfWorkOptions to AbpUnitOfWorkOptions --- .../Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs | 4 ++-- ...tOfWorkOptions.cs => AbpUnitOfWorkOptions.cs} | 6 +++--- .../Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs | 4 ++-- ...OfWorkOptions.cs => IAbpUnitOfWorkOptions.cs} | 2 +- .../src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs | 4 ++-- .../Volo/Abp/Uow/IUnitOfWorkManager.cs | 6 +++--- .../src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs | 4 ++-- .../Volo/Abp/Uow/UnitOfWorkAttribute.cs | 2 +- .../Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs | 2 +- .../Volo/Abp/Uow/UnitOfWorkInterceptor.cs | 4 ++-- .../Volo/Abp/Uow/UnitOfWorkManager.cs | 6 +++--- .../Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs | 6 +++--- .../Repositories/PersonDapperRepository_Tests.cs | 2 +- .../Transactions/Transaction_Tests.cs | 6 +++--- .../Volo/Abp/TestApp/Testing/TestAppTestBase.cs | 16 ++++++++-------- .../AbpPermissionManagementDomainSharedModule.cs | 2 +- .../AbpPermissionManagementWebModule.cs | 2 +- .../AbpSettingManagementDomainSharedModule.cs | 2 +- .../AbpSettingManagementWebModule.cs | 2 +- .../AbpTenantManagementDomainSharedModule.cs | 2 +- .../AbpTenantManagementWebModule.cs | 2 +- .../BookStoreDomainSharedModule.cs | 2 +- .../BookStoreHttpApiHostModule.cs | 2 +- .../Acme.BookStore.TestBase/BookStoreTestBase.cs | 16 ++++++++-------- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../Acme.BookStore.TestBase/BookStoreTestBase.cs | 16 ++++++++-------- .../BookManagementHttpApiHostModule.cs | 2 +- .../BookManagementWebHostModule.cs | 2 +- .../BookManagementWebUnifiedModule.cs | 2 +- .../BookManagementApplicationContractsModule.cs | 2 +- .../BookManagementDomainSharedModule.cs | 2 +- .../BookManagementWebModule.cs | 2 +- .../BookManagementTestBase.cs | 16 ++++++++-------- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../Acme.BookStore.TestBase/BookStoreTestBase.cs | 16 ++++++++-------- .../DashboardDemoDomainSharedModule.cs | 2 +- .../DashboardDemo.Web/DashboardDemoWebModule.cs | 2 +- .../DashboardDemoTestBase.cs | 16 ++++++++-------- ...roductManagementApplicationContractsModule.cs | 2 +- .../ProductManagementDomainModule.cs | 2 +- .../ProductManagementWebModule.cs | 2 +- .../ProductManagementDomainTestBase.cs | 16 ++++++++-------- .../MyProjectNameDomainSharedModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameTestBase.cs | 16 ++++++++-------- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameWebHostModule.cs | 2 +- .../MyProjectNameWebUnifiedModule.cs | 2 +- .../MyProjectNameApplicationContractsModule.cs | 2 +- .../MyProjectNameDomainSharedModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameTestBase.cs | 16 ++++++++-------- 58 files changed, 136 insertions(+), 136 deletions(-) rename framework/src/Volo.Abp.Uow/Volo/Abp/Uow/{UnitOfWorkOptions.cs => AbpUnitOfWorkOptions.cs} (76%) rename framework/src/Volo.Abp.Uow/Volo/Abp/Uow/{IUnitOfWorkOptions.cs => IAbpUnitOfWorkOptions.cs} (81%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs index 0a03a0dc67..c459982007 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs @@ -68,9 +68,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow } } - private UnitOfWorkOptions CreateOptions(ActionExecutingContext context, UnitOfWorkAttribute unitOfWorkAttribute) + private AbpUnitOfWorkOptions CreateOptions(ActionExecutingContext context, UnitOfWorkAttribute unitOfWorkAttribute) { - var options = new UnitOfWorkOptions(); + var options = new AbpUnitOfWorkOptions(); unitOfWorkAttribute?.SetOptions(options); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.cs similarity index 76% rename from framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs rename to framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.cs index 3d433f3738..dd39612921 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.cs @@ -3,7 +3,7 @@ using System.Data; namespace Volo.Abp.Uow { - public class UnitOfWorkOptions : IUnitOfWorkOptions + public class AbpUnitOfWorkOptions : IAbpUnitOfWorkOptions { /// /// Default: false. @@ -14,9 +14,9 @@ namespace Volo.Abp.Uow public TimeSpan? Timeout { get; set; } - public UnitOfWorkOptions Clone() + public AbpUnitOfWorkOptions Clone() { - return new UnitOfWorkOptions + return new AbpUnitOfWorkOptions { IsTransactional = IsTransactional, IsolationLevel = IsolationLevel, diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs index 508fb1db4f..0d2686cdfe 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Uow { public Guid Id => _parent.Id; - public IUnitOfWorkOptions Options => _parent.Options; + public IAbpUnitOfWorkOptions Options => _parent.Options; public IUnitOfWork Outer => _parent.Outer; @@ -43,7 +43,7 @@ namespace Volo.Abp.Uow _parent.SetOuter(outer); } - public void Initialize(UnitOfWorkOptions options) + public void Initialize(AbpUnitOfWorkOptions options) { _parent.Initialize(options); } diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.cs similarity index 81% rename from framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs rename to framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.cs index b79b7112b8..1f63a12b6d 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.cs @@ -3,7 +3,7 @@ using System.Data; namespace Volo.Abp.Uow { - public interface IUnitOfWorkOptions + public interface IAbpUnitOfWorkOptions { bool IsTransactional { get; } diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs index cdf1a505b8..cf65ca69e7 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Uow event EventHandler Disposed; - IUnitOfWorkOptions Options { get; } + IAbpUnitOfWorkOptions Options { get; } IUnitOfWork Outer { get; } @@ -28,7 +28,7 @@ namespace Volo.Abp.Uow void SetOuter([CanBeNull] IUnitOfWork outer); - void Initialize([NotNull] UnitOfWorkOptions options); + void Initialize([NotNull] AbpUnitOfWorkOptions options); void Reserve([NotNull] string reservationName); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs index 264390fbbe..b997cb6970 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs @@ -8,13 +8,13 @@ namespace Volo.Abp.Uow IUnitOfWork Current { get; } [NotNull] - IUnitOfWork Begin([NotNull] UnitOfWorkOptions options, bool requiresNew = false); + IUnitOfWork Begin([NotNull] AbpUnitOfWorkOptions options, bool requiresNew = false); [NotNull] IUnitOfWork Reserve([NotNull] string reservationName, bool requiresNew = false); - void BeginReserved([NotNull] string reservationName, [NotNull] UnitOfWorkOptions options); + void BeginReserved([NotNull] string reservationName, [NotNull] AbpUnitOfWorkOptions options); - bool TryBeginReserved([NotNull] string reservationName, [NotNull] UnitOfWorkOptions options); + bool TryBeginReserved([NotNull] string reservationName, [NotNull] AbpUnitOfWorkOptions options); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs index 0270e04d50..f3b30cf388 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.Uow { public Guid Id { get; } = Guid.NewGuid(); - public IUnitOfWorkOptions Options { get; private set; } + public IAbpUnitOfWorkOptions Options { get; private set; } public IUnitOfWork Outer { get; private set; } @@ -49,7 +49,7 @@ namespace Volo.Abp.Uow _transactionApis = new Dictionary(); } - public virtual void Initialize(UnitOfWorkOptions options) + public virtual void Initialize(AbpUnitOfWorkOptions options) { Check.NotNull(options, nameof(options)); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs index 26a7ca51f4..2dee2cd390 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs @@ -62,7 +62,7 @@ namespace Volo.Abp.Uow //TODO: More constructors! - public virtual void SetOptions(UnitOfWorkOptions options) + public virtual void SetOptions(AbpUnitOfWorkOptions options) { if (IsTransactional.HasValue) { diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs index 49ff633a5e..a13c77be33 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.Uow public TimeSpan? Timeout { get; set; } - internal UnitOfWorkOptions Normalize(UnitOfWorkOptions options) + internal AbpUnitOfWorkOptions Normalize(AbpUnitOfWorkOptions options) { if (options.IsolationLevel == null) { diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs index 12a6f0e101..7e04c2b808 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs @@ -48,9 +48,9 @@ namespace Volo.Abp.Uow } } - private UnitOfWorkOptions CreateOptions(IAbpMethodInvocation invocation, [CanBeNull] UnitOfWorkAttribute unitOfWorkAttribute) + private AbpUnitOfWorkOptions CreateOptions(IAbpMethodInvocation invocation, [CanBeNull] UnitOfWorkAttribute unitOfWorkAttribute) { - var options = new UnitOfWorkOptions(); + var options = new AbpUnitOfWorkOptions(); unitOfWorkAttribute?.SetOptions(options); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs index 73f9956876..479cf45117 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.Uow _serviceScopeFactory = serviceScopeFactory; } - public IUnitOfWork Begin(UnitOfWorkOptions options, bool requiresNew = false) + public IUnitOfWork Begin(AbpUnitOfWorkOptions options, bool requiresNew = false) { Check.NotNull(options, nameof(options)); @@ -52,7 +52,7 @@ namespace Volo.Abp.Uow return unitOfWork; } - public void BeginReserved(string reservationName, UnitOfWorkOptions options) + public void BeginReserved(string reservationName, AbpUnitOfWorkOptions options) { if (!TryBeginReserved(reservationName, options)) { @@ -60,7 +60,7 @@ namespace Volo.Abp.Uow } } - public bool TryBeginReserved(string reservationName, UnitOfWorkOptions options) + public bool TryBeginReserved(string reservationName, AbpUnitOfWorkOptions options) { Check.NotNull(reservationName, nameof(reservationName)); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs index c9f888f275..bf8859d6ac 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Uow { Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager)); - return unitOfWorkManager.Begin(new UnitOfWorkOptions(), requiresNew); + return unitOfWorkManager.Begin(new AbpUnitOfWorkOptions(), requiresNew); } public static void BeginReserved([NotNull] this IUnitOfWorkManager unitOfWorkManager, [NotNull] string reservationName) @@ -17,7 +17,7 @@ namespace Volo.Abp.Uow Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager)); Check.NotNull(reservationName, nameof(reservationName)); - unitOfWorkManager.BeginReserved(reservationName, new UnitOfWorkOptions()); + unitOfWorkManager.BeginReserved(reservationName, new AbpUnitOfWorkOptions()); } public static void TryBeginReserved([NotNull] this IUnitOfWorkManager unitOfWorkManager, [NotNull] string reservationName) @@ -25,7 +25,7 @@ namespace Volo.Abp.Uow Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager)); Check.NotNull(reservationName, nameof(reservationName)); - unitOfWorkManager.TryBeginReserved(reservationName, new UnitOfWorkOptions()); + unitOfWorkManager.TryBeginReserved(reservationName, new AbpUnitOfWorkOptions()); } } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs b/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs index 3b5a7a4dd3..28734c1fd0 100644 --- a/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs +++ b/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs @@ -36,7 +36,7 @@ namespace Volo.Abp.Dapper.Repositories var unitOfWorkManager = GetRequiredService(); var personDapperRepository = GetRequiredService(); - using (var uow = unitOfWorkManager.Begin(new UnitOfWorkOptions + using (var uow = unitOfWorkManager.Begin(new AbpUnitOfWorkOptions { IsTransactional = true })) diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs index 613c42894c..7d89da1a08 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.EntityFrameworkCore.Transactions try { - await WithUnitOfWorkAsync(new UnitOfWorkOptions { IsTransactional = true }, async () => + await WithUnitOfWorkAsync(new AbpUnitOfWorkOptions { IsTransactional = true }, async () => { await _personRepository.InsertAsync(new Person(personId, "Adam", 42)); throw new Exception(exceptionMessage); @@ -52,7 +52,7 @@ namespace Volo.Abp.EntityFrameworkCore.Transactions { var personId = Guid.NewGuid(); - await WithUnitOfWorkAsync(new UnitOfWorkOptions { IsTransactional = true }, async () => + await WithUnitOfWorkAsync(new AbpUnitOfWorkOptions { IsTransactional = true }, async () => { _unitOfWorkManager.Current.ShouldNotBeNull(); @@ -75,7 +75,7 @@ namespace Volo.Abp.EntityFrameworkCore.Transactions { var uowManager = scope.ServiceProvider.GetRequiredService(); - using (uowManager.Begin(new UnitOfWorkOptions { IsTransactional = true })) + using (uowManager.Begin(new AbpUnitOfWorkOptions { IsTransactional = true })) { _unitOfWorkManager.Current.ShouldNotBeNull(); diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs index 0f4af6666a..647e5eaa03 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs @@ -18,10 +18,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -38,10 +38,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -58,10 +58,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -78,10 +78,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs index adae510945..210ff6affc 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.PermissionManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs index 38fd9827a1..cf1c3f13b1 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.PermissionManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.PermissionManagement.Web"); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs index 5f6f174f82..d6b6ba065e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.SettingManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index a99317daa4..a9043eb115 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.SettingManagement.Web options.MenuContributors.Add(new SettingManagementMainMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.SettingManagement.Web"); }); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs index 873593f9ca..2058ae5425 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.TenantManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index 626970a1a9..dacf80475a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.TenantManagement.Web options.MenuContributors.Add(new AbpTenantManagementWebMainMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.TenantManagement.Web"); }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index f0a6ad7964..e7f8fc146a 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore"); }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs index 1ab494026d..e0e96da5b6 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs @@ -69,7 +69,7 @@ namespace Acme.BookStore if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain")); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs index ba9d7c6b57..225ab01776 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs @@ -19,10 +19,10 @@ namespace Acme.BookStore protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace Acme.BookStore protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index 85cda77f69..fe94f9d80d 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -30,7 +30,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore"); }); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index 2b78cb9cab..89c3264848 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -115,7 +115,7 @@ namespace Acme.BookStore.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}book-management{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}Acme.BookStore.BookManagement.Web")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain.Shared")); diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs index ba9d7c6b57..225ab01776 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs @@ -19,10 +19,10 @@ namespace Acme.BookStore protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace Acme.BookStore protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 6eddcf5707..3c45ec7c8f 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -54,7 +54,7 @@ namespace Acme.BookStore.BookManagement if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index 78072c9fe1..5a1fca1dc8 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -153,7 +153,7 @@ namespace Acme.BookStore.BookManagement { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Application.Contracts", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs index bb4ec08c12..0449d0a372 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs @@ -68,7 +68,7 @@ namespace Acme.BookStore.BookManagement if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs index be7f25cce2..9672318d88 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs @@ -12,7 +12,7 @@ namespace Acme.BookStore.BookManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore.BookManagement"); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs index 9cd37017c1..b64b359004 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs @@ -14,7 +14,7 @@ namespace Acme.BookStore.BookManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore.BookManagement"); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs index 6aa4763cbf..e038ca13d8 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs @@ -32,7 +32,7 @@ namespace Acme.BookStore.BookManagement.Web options.MenuContributors.Add(new BookManagementMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore.BookManagement.Web"); }); diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs index 38f82684ad..d4a4de4ea9 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs @@ -18,10 +18,10 @@ namespace Acme.BookStore.BookManagement protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -38,10 +38,10 @@ namespace Acme.BookStore.BookManagement protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -58,10 +58,10 @@ namespace Acme.BookStore.BookManagement protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -78,10 +78,10 @@ namespace Acme.BookStore.BookManagement protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index f0a6ad7964..e7f8fc146a 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore"); }); diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 767b3ca138..06662e9b5f 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -108,7 +108,7 @@ namespace Acme.BookStore.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}Acme.BookStore.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}Acme.BookStore.Domain", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs b/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs index ba9d7c6b57..225ab01776 100644 --- a/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs +++ b/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs @@ -19,10 +19,10 @@ namespace Acme.BookStore protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace Acme.BookStore protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs b/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs index b72a92121a..4b7195bb94 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace DashboardDemo { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("DashboardDemo"); }); diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index c599ee0ac4..77177b4aa5 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -114,7 +114,7 @@ namespace DashboardDemo.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Domain.Shared", Path.DirectorySeparatorChar))); diff --git a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs index 996a19aaf1..6cb687f0b9 100644 --- a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs +++ b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs @@ -19,10 +19,10 @@ namespace DashboardDemo protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace DashboardDemo protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace DashboardDemo protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace DashboardDemo protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs index fedac990be..cb6ba03047 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs @@ -16,7 +16,7 @@ namespace ProductManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs index 3dcd5c6f13..c1f4aebf55 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs @@ -18,7 +18,7 @@ namespace ProductManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs index 16e7cf0c76..a544b49644 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs @@ -33,7 +33,7 @@ namespace ProductManagement options.MenuContributors.Add(new ProductManagementMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("ProductManagement"); }); diff --git a/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs b/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs index 7ad63742ba..062c57b44b 100644 --- a/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs +++ b/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs @@ -11,10 +11,10 @@ namespace ProductManagement protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -31,10 +31,10 @@ namespace ProductManagement protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -51,10 +51,10 @@ namespace ProductManagement protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -71,10 +71,10 @@ namespace ProductManagement protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 2de342535f..cb1f23151e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 387baee3ea..7eb27fdf2e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -67,7 +67,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain")); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index db8f6cf0a4..bfe87f7bcf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -69,7 +69,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain")); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index c083974f12..b06ba2e16f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -69,7 +69,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain")); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 5028b6d344..fea25f5908 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -151,7 +151,7 @@ namespace MyCompanyName.MyProjectName.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 25a59a3d07..547dabe001 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -115,7 +115,7 @@ namespace MyCompanyName.MyProjectName.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs index f8248c5690..5cb98cde0c 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs @@ -19,10 +19,10 @@ namespace MyCompanyName.MyProjectName protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace MyCompanyName.MyProjectName protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 84517aacc3..29c3f37b2a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -53,7 +53,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index ef0e9556fd..2f7a728a3c 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -153,7 +153,7 @@ namespace MyCompanyName.MyProjectName { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index 0999f1d3b2..8f68ec5de4 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -67,7 +67,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs index 947e42f33a..5df67ff031 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs @@ -14,7 +14,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 0141c3acb9..18d257c65b 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -14,7 +14,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index ec4ffacad5..c48e57542c 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -37,7 +37,7 @@ namespace MyCompanyName.MyProjectName.Web options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName.Web"); }); diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs index 93304dfaeb..638ef8d4a3 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs @@ -18,10 +18,10 @@ namespace MyCompanyName.MyProjectName protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -38,10 +38,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -58,10 +58,10 @@ namespace MyCompanyName.MyProjectName protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -78,10 +78,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { From 36149fc49da8257929488aef190457c4c249aa45 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:56:04 +0300 Subject: [PATCH 40/96] UnitOfWorkDefaultOptions to AbpUnitOfWorkDefaultOptions --- .../Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs | 4 ++-- ...OfWorkDefaultOptions.cs => AbpUnitOfWorkDefaultOptions.cs} | 2 +- framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs | 4 ++-- .../src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs | 4 ++-- .../Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs | 2 +- .../AbpPermissionManagementEntityFrameworkCoreTestModule.cs | 2 +- .../PermissionManagement/AbpPermissionManagementTestModule.cs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename framework/src/Volo.Abp.Uow/Volo/Abp/Uow/{UnitOfWorkDefaultOptions.cs => AbpUnitOfWorkDefaultOptions.cs} (96%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs index c459982007..552ce7e04e 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs @@ -13,9 +13,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow public class AbpUowActionFilter : IAsyncActionFilter, ITransientDependency { private readonly IUnitOfWorkManager _unitOfWorkManager; - private readonly UnitOfWorkDefaultOptions _defaultOptions; + private readonly AbpUnitOfWorkDefaultOptions _defaultOptions; - public AbpUowActionFilter(IUnitOfWorkManager unitOfWorkManager, IOptions options) + public AbpUowActionFilter(IUnitOfWorkManager unitOfWorkManager, IOptions options) { _unitOfWorkManager = unitOfWorkManager; _defaultOptions = options.Value; diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkDefaultOptions.cs similarity index 96% rename from framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs rename to framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkDefaultOptions.cs index a13c77be33..789e4f8e58 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkDefaultOptions.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.Uow /// /// Global (default) unit of work options /// - public class UnitOfWorkDefaultOptions + public class AbpUnitOfWorkDefaultOptions { public UnitOfWorkTransactionBehavior TransactionBehavior { get; set; } diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs index f3b30cf388..5b857e8828 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs @@ -34,13 +34,13 @@ namespace Volo.Abp.Uow private readonly Dictionary _databaseApis; private readonly Dictionary _transactionApis; - private readonly UnitOfWorkDefaultOptions _defaultOptions; + private readonly AbpUnitOfWorkDefaultOptions _defaultOptions; private Exception _exception; private bool _isCompleting; private bool _isRolledback; - public UnitOfWork(IServiceProvider serviceProvider, IOptions options) + public UnitOfWork(IServiceProvider serviceProvider, IOptions options) { ServiceProvider = serviceProvider; _defaultOptions = options.Value; diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs index 7e04c2b808..1ca6681189 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.Uow public class UnitOfWorkInterceptor : AbpInterceptor, ITransientDependency { private readonly IUnitOfWorkManager _unitOfWorkManager; - private readonly UnitOfWorkDefaultOptions _defaultOptions; + private readonly AbpUnitOfWorkDefaultOptions _defaultOptions; - public UnitOfWorkInterceptor(IUnitOfWorkManager unitOfWorkManager, IOptions options) + public UnitOfWorkInterceptor(IUnitOfWorkManager unitOfWorkManager, IOptions options) { _unitOfWorkManager = unitOfWorkManager; _defaultOptions = options.Value; diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs index a00cf2fcf8..079120e8d3 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow { private readonly TestUnitOfWorkConfig _config; - public TestUnitOfWork(IServiceProvider serviceProvider, IOptions options, TestUnitOfWorkConfig config) + public TestUnitOfWork(IServiceProvider serviceProvider, IOptions options, TestUnitOfWorkConfig config) : base(serviceProvider, options) { _config = config; diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementEntityFrameworkCoreTestModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementEntityFrameworkCoreTestModule.cs index 9f122fc17c..f4d2538696 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementEntityFrameworkCoreTestModule.cs +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementEntityFrameworkCoreTestModule.cs @@ -26,7 +26,7 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore }); }); - Configure(options => + Configure(options => { options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled; //EF in-memory database does not support transactions }); diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementTestModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementTestModule.cs index 42894b5eb9..5c730ab0ab 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementTestModule.cs +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.Tests/Volo/Abp/PermissionManagement/AbpPermissionManagementTestModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.PermissionManagement }); }); - Configure(options => + Configure(options => { options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled; //EF in-memory database does not support transactions }); From 62f805e7377a9e873a6f6daec93acd17ce569eb4 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:56:20 +0300 Subject: [PATCH 41/96] UnitOfWorkDefaultOptions to AbpUnitOfWorkDefaultOptions cont. --- .../AbpTenantManagementEntityFrameworkCoreTestModule.cs | 2 +- .../AbpUsersEntityFrameworkCoreTestModule.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementEntityFrameworkCoreTestModule.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementEntityFrameworkCoreTestModule.cs index dd5d9f8ae2..2328c4e302 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementEntityFrameworkCoreTestModule.cs +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementEntityFrameworkCoreTestModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore }); }); - Configure(options => + Configure(options => { options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled; //EF in-memory database does not support transactions }); diff --git a/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo/Abp/Users/EntityFrameworkCore/AbpUsersEntityFrameworkCoreTestModule.cs b/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo/Abp/Users/EntityFrameworkCore/AbpUsersEntityFrameworkCoreTestModule.cs index cba8126af0..7a19077afe 100644 --- a/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo/Abp/Users/EntityFrameworkCore/AbpUsersEntityFrameworkCoreTestModule.cs +++ b/modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests/Volo/Abp/Users/EntityFrameworkCore/AbpUsersEntityFrameworkCoreTestModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.Users.EntityFrameworkCore }); }); - services.Configure(options => + services.Configure(options => { options.TransactionBehavior = UnitOfWorkTransactionBehavior.Disabled; //EF in-memory database does not support transactions }); From df386b9ba76579a406dd85279592971b855a7271 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:57:54 +0300 Subject: [PATCH 42/96] NavigationOptions to AbpNavigationOptions --- .../{NavigationOptions.cs => AbpNavigationOptions.cs} | 4 ++-- .../Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs | 2 +- .../Volo/Abp/Ui/Navigation/MenuManager.cs | 4 ++-- .../Volo/Abp/Ui/Navigation/MenuManager_Tests.cs | 2 +- .../account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs | 2 +- modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs | 2 +- modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs | 2 +- .../src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs | 2 +- .../AbpSettingManagementWebModule.cs | 2 +- .../AbpTenantManagementWebModule.cs | 2 +- .../application/src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs | 2 +- .../BookManagementWebModule.cs | 2 +- .../BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs | 2 +- .../src/DashboardDemo.Web/DashboardDemoWebModule.cs | 2 +- .../DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs | 2 +- .../PublicWebSite.Host/PublicWebSiteHostModule.cs | 2 +- .../src/ProductManagement.Web/ProductManagementWebModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 2 +- .../MyProjectNameWebTestModule.cs | 2 +- .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 2 +- 23 files changed, 25 insertions(+), 25 deletions(-) rename framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/{NavigationOptions.cs => AbpNavigationOptions.cs} (78%) diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpNavigationOptions.cs similarity index 78% rename from framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs rename to framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpNavigationOptions.cs index 2237add732..75c2d426d9 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpNavigationOptions.cs @@ -3,12 +3,12 @@ using JetBrains.Annotations; namespace Volo.Abp.UI.Navigation { - public class NavigationOptions + public class AbpNavigationOptions { [NotNull] public List MenuContributors { get; } - public NavigationOptions() + public AbpNavigationOptions() { MenuContributors = new List(); } diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs index 5ee47556c7..47889336a8 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.UI.Navigation .AddVirtualJson("/Volo/Abp/Ui/Navigation/Localization/Resource"); }); - Configure(options => + Configure(options => { options.MenuContributors.Add(new DefaultMenuContributor()); }); diff --git a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs index 9c96006b02..5c33866aa2 100644 --- a/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs +++ b/framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs @@ -9,11 +9,11 @@ namespace Volo.Abp.UI.Navigation { public class MenuManager : IMenuManager, ITransientDependency { - protected NavigationOptions Options { get; } + protected AbpNavigationOptions Options { get; } protected IHybridServiceScopeFactory ServiceScopeFactory { get; } public MenuManager( - IOptions options, + IOptions options, IHybridServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; diff --git a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs index 3361dc72ba..5fed48c828 100644 --- a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs +++ b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs @@ -39,7 +39,7 @@ namespace Volo.Abp.UI.Navigation { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new TestMenuContributor1()); options.MenuContributors.Add(new TestMenuContributor2()); diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs index 4d7e41d663..288439a97a 100644 --- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs +++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs @@ -40,7 +40,7 @@ namespace Volo.Abp.Account.Web options.FileSets.AddEmbedded("Volo.Abp.Account.Web"); }); - Configure(options => + Configure(options => { options.MenuContributors.Add(new AbpAccountUserMenuContributor()); }); diff --git a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs index b50570a461..063ecebf5b 100644 --- a/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs +++ b/modules/blogging/src/Volo.Blogging.Web/BloggingWebModule.cs @@ -35,7 +35,7 @@ namespace Volo.Blogging public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BloggingMenuContributor()); }); diff --git a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs index cb165e3576..de404a5884 100644 --- a/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs +++ b/modules/docs/src/Volo.Docs.Admin.Web/DocsAdminWebModule.cs @@ -36,7 +36,7 @@ namespace Volo.Docs.Admin public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new DocsMenuContributor()); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs index 0c4ab84dee..8d2ba91695 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs @@ -35,7 +35,7 @@ namespace Volo.Abp.Identity.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new AbpIdentityWebMainMenuContributor()); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index a9043eb115..3e0cd0a7f1 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.SettingManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new SettingManagementMainMenuContributor()); }); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index dacf80475a..a3f066594e 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -37,7 +37,7 @@ namespace Volo.Abp.TenantManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new AbpTenantManagementWebMainMenuContributor()); }); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index 89c3264848..3c16c12a3d 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -147,7 +147,7 @@ namespace Acme.BookStore.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs index 5a3017a53e..b9d79b1baa 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs @@ -62,7 +62,7 @@ namespace Acme.BookStore private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs index e038ca13d8..362908f5bb 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs @@ -27,7 +27,7 @@ namespace Acme.BookStore.BookManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BookManagementMenuContributor()); }); diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 06662e9b5f..800e6d463b 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -139,7 +139,7 @@ namespace Acme.BookStore.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs index c544d97116..166ade18d6 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs @@ -62,7 +62,7 @@ namespace Acme.BookStore private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new BookStoreMenuContributor()); }); diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index 77177b4aa5..120e29466b 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -146,7 +146,7 @@ namespace DashboardDemo.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new DashboardDemoMenuContributor()); }); diff --git a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs index 017113a95a..9e551d04d1 100644 --- a/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs +++ b/samples/DashboardDemo/test/DashboardDemo.Web.Tests/DashboardDemoWebTestModule.cs @@ -62,7 +62,7 @@ namespace DashboardDemo private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new DashboardDemoMenuContributor()); }); diff --git a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs index 2bd53de87b..0843eae579 100644 --- a/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs +++ b/samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs @@ -40,7 +40,7 @@ namespace PublicWebSite.Host options.Languages.Add(new LanguageInfo("en", "en", "English")); }); - Configure(options => + Configure(options => { options.MenuContributors.Add(new PublicWebSiteMenuContributor()); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs index a544b49644..aa1c36303f 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs @@ -28,7 +28,7 @@ namespace ProductManagement public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new ProductManagementMenuContributor()); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index fea25f5908..0171ea9386 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -171,7 +171,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureNavigationServices(IConfigurationRoot configuration) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor(configuration)); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 547dabe001..3ea6dc5f8a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -159,7 +159,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureNavigationServices() { - Configure(options => + Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs index 9da3a72716..4c32a7b00a 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestModule.cs @@ -62,7 +62,7 @@ namespace MyCompanyName.MyProjectName private static void ConfigureNavigationServices(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index c48e57542c..213161e296 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -32,7 +32,7 @@ namespace MyCompanyName.MyProjectName.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); From 92c59dc6644054e74b202459818e0f71d400a29b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:25:13 +0300 Subject: [PATCH 43/96] ClockOptions to AbpClockOptions --- .../Volo/Abp/Timing/{ClockOptions.cs => AbpClockOptions.cs} | 4 ++-- framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename framework/src/Volo.Abp.Timing/Volo/Abp/Timing/{ClockOptions.cs => AbpClockOptions.cs} (80%) diff --git a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/ClockOptions.cs b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/AbpClockOptions.cs similarity index 80% rename from framework/src/Volo.Abp.Timing/Volo/Abp/Timing/ClockOptions.cs rename to framework/src/Volo.Abp.Timing/Volo/Abp/Timing/AbpClockOptions.cs index 529f048857..ba7f35df9f 100644 --- a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/ClockOptions.cs +++ b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/AbpClockOptions.cs @@ -2,14 +2,14 @@ using System; namespace Volo.Abp.Timing { - public class ClockOptions + public class AbpClockOptions { /// /// Default: /// public DateTimeKind Kind { get; set; } - public ClockOptions() + public AbpClockOptions() { Kind = DateTimeKind.Unspecified; } diff --git a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs index 55bfbdc284..8e535a52c7 100644 --- a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs +++ b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.Timing { public class Clock : IClock, ITransientDependency { - protected ClockOptions Options { get; } + protected AbpClockOptions Options { get; } - public Clock(IOptions options) + public Clock(IOptions options) { Options = options.Value; } From be60cd2f8794b5a4140ec585d91742f53b86af1c Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:37:32 +0300 Subject: [PATCH 44/96] MongoModelBuilderConfigurationOptions to AbpMongoModelBuilderConfigurationOptions --- ...Options.cs => AbpMongoModelBuilderConfigurationOptions.cs} | 4 ++-- .../AuditLoggingMongoModelBuilderConfigurationOptions.cs | 2 +- .../MongoDB/BackgroundJobsMongoDbContextExtensions.cs | 2 +- .../BackgroundJobsMongoModelBuilderConfigurationOptions.cs | 2 +- .../Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs | 2 +- .../MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs | 2 +- .../Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs | 2 +- .../Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs | 2 +- .../MongoDB/FeatureManagementMongoDbContextExtensions.cs | 2 +- .../FeatureManagementMongoModelBuilderConfigurationOptions.cs | 2 +- .../MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs | 2 +- .../IdentityServerMongoModelBuilderConfigurationOptions.cs | 2 +- .../AbpPermissionManagementMongoDbContextExtensions.cs | 2 +- ...rmissionManagementMongoModelBuilderConfigurationOptions.cs | 2 +- .../SettingManagementMongoModelBuilderConfigurationOptions.cs | 2 +- .../MongoDb/AbpTenantManagementMongoDbContextExtensions.cs | 2 +- .../TenantManagementMongoModelBuilderConfigurationOptions.cs | 2 +- .../MongoDB/BookManagementMongoDbContextExtensions.cs | 2 +- .../BookManagementMongoModelBuilderConfigurationOptions.cs | 2 +- .../MongoDB/MyProjectNameMongoDbContextExtensions.cs | 2 +- .../MyProjectNameMongoModelBuilderConfigurationOptions.cs | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) rename framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/{MongoModelBuilderConfigurationOptions.cs => AbpMongoModelBuilderConfigurationOptions.cs} (79%) diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilderConfigurationOptions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoModelBuilderConfigurationOptions.cs similarity index 79% rename from framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilderConfigurationOptions.cs rename to framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoModelBuilderConfigurationOptions.cs index 85fd1c8802..b959e0c239 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/MongoModelBuilderConfigurationOptions.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoModelBuilderConfigurationOptions.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; namespace Volo.Abp.MongoDB { - public class MongoModelBuilderConfigurationOptions + public class AbpMongoModelBuilderConfigurationOptions { [NotNull] public string CollectionPrefix @@ -16,7 +16,7 @@ namespace Volo.Abp.MongoDB } private string _collectionPrefix; - public MongoModelBuilderConfigurationOptions([NotNull] string collectionPrefix = "") + public AbpMongoModelBuilderConfigurationOptions([NotNull] string collectionPrefix = "") { Check.NotNull(collectionPrefix, nameof(collectionPrefix)); diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/AuditLoggingMongoModelBuilderConfigurationOptions.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/AuditLoggingMongoModelBuilderConfigurationOptions.cs index d3fadc3e28..553ba4d01c 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/AuditLoggingMongoModelBuilderConfigurationOptions.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/AuditLoggingMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.AuditLogging.MongoDB { - public class AuditLoggingMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class AuditLoggingMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public AuditLoggingMongoModelBuilderConfigurationOptions( [NotNull] string collectionPrefix = "") diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs index a16def3668..31291f2d9b 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbContextExtensions.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.BackgroundJobs.MongoDB { public static void ConfigureBackgroundJobs( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoModelBuilderConfigurationOptions.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoModelBuilderConfigurationOptions.cs index 3833841b9f..7590fb0d12 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoModelBuilderConfigurationOptions.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.BackgroundJobs.MongoDB { - public class BackgroundJobsMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class BackgroundJobsMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public BackgroundJobsMongoModelBuilderConfigurationOptions( [NotNull] string collectionPrefix = "") diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs index ecb9b45a33..3defbc1287 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoDbContextExtensions.cs @@ -12,7 +12,7 @@ namespace Volo.Blogging.MongoDB { public static void ConfigureBlogging( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs index 2e73f1a00c..d2fb415166 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo/Blogging/MongoDB/BloggingMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Blogging.MongoDB { - public class BloggingMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class BloggingMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public BloggingMongoModelBuilderConfigurationOptions( [NotNull] string collectionPrefix = "") diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs index 865da90981..456070a645 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoDbContextExtensions.cs @@ -9,7 +9,7 @@ namespace Volo.Docs.MongoDB { public static void ConfigureDocs( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs index 20a67382a1..4bb1c76372 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo/Docs/MongoDB/DocsMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Docs.MongoDB { - public class DocsMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class DocsMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public DocsMongoModelBuilderConfigurationOptions( [NotNull] string collectionPrefix) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs index 48c3f88dd2..55ef3b616a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoDbContextExtensions.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.FeatureManagement.MongoDB { public static void ConfigureFeatureManagement( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs index e4ba0bbc8a..edb486e906 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/FeatureManagementMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.FeatureManagement.MongoDB { - public class FeatureManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class FeatureManagementMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public FeatureManagementMongoModelBuilderConfigurationOptions( [NotNull] string collectionPrefix = "") diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs index e1c6796d84..d36fc17877 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/IdentityMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.Identity.MongoDB { - public class IdentityMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class IdentityMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public IdentityMongoModelBuilderConfigurationOptions([NotNull] string collectionPrefix = "") : base(collectionPrefix) diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/IdentityServerMongoModelBuilderConfigurationOptions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/IdentityServerMongoModelBuilderConfigurationOptions.cs index f6afe62737..55556e105b 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/IdentityServerMongoModelBuilderConfigurationOptions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/IdentityServerMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.IdentityServer.MongoDB { - public class IdentityServerMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class IdentityServerMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public IdentityServerMongoModelBuilderConfigurationOptions([NotNull] string collectionPrefix = "") : base(collectionPrefix) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbContextExtensions.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbContextExtensions.cs index e3ec872065..cf81d69a19 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbContextExtensions.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbContextExtensions.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.PermissionManagement.MongoDB { public static void ConfigurePermissionManagement( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/PermissionManagementMongoModelBuilderConfigurationOptions.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/PermissionManagementMongoModelBuilderConfigurationOptions.cs index 0af620956c..acc7d5cb84 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/PermissionManagementMongoModelBuilderConfigurationOptions.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/PermissionManagementMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.PermissionManagement.MongoDB { - public class PermissionManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class PermissionManagementMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public PermissionManagementMongoModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "") diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoModelBuilderConfigurationOptions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoModelBuilderConfigurationOptions.cs index a603e1e204..bdc423f8a1 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoModelBuilderConfigurationOptions.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.SettingManagement.MongoDB { - public class SettingManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class SettingManagementMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public SettingManagementMongoModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "") diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbContextExtensions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbContextExtensions.cs index 590feb6a39..18b2049450 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbContextExtensions.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbContextExtensions.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.TenantManagement.MongoDB { public static void ConfigureTenantManagement( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/TenantManagementMongoModelBuilderConfigurationOptions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/TenantManagementMongoModelBuilderConfigurationOptions.cs index 3b964a8940..09f54572b2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/TenantManagementMongoModelBuilderConfigurationOptions.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/TenantManagementMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.TenantManagement.MongoDB { - public class TenantManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class TenantManagementMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public TenantManagementMongoModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "") diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoDbContextExtensions.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoDbContextExtensions.cs index cd6090a94e..f32ad21f3a 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoDbContextExtensions.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoDbContextExtensions.cs @@ -8,7 +8,7 @@ namespace Acme.BookStore.BookManagement.MongoDB { public static void ConfigureBookManagement( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoModelBuilderConfigurationOptions.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoModelBuilderConfigurationOptions.cs index 5ff102015a..73b17c0532 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoModelBuilderConfigurationOptions.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.MongoDB/MongoDB/BookManagementMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace Acme.BookStore.BookManagement.MongoDB { - public class BookManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class BookManagementMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public BookManagementMongoModelBuilderConfigurationOptions( [NotNull] string tablePrefix = BookManagementConsts.DefaultDbTablePrefix) diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs index b71c77e231..4dca336b5e 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs @@ -8,7 +8,7 @@ namespace MyCompanyName.MyProjectName.MongoDB { public static void ConfigureMyProjectName( this IMongoModelBuilder builder, - Action optionsAction = null) + Action optionsAction = null) { Check.NotNull(builder, nameof(builder)); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs index c0038f1f12..c40728fefa 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace MyCompanyName.MyProjectName.MongoDB { - public class MyProjectNameMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions + public class MyProjectNameMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions { public MyProjectNameMongoModelBuilderConfigurationOptions( [NotNull] string collectionPrefix = "") From fda53d1e6d68cf750acf57a778319987c55075a7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:38:58 +0300 Subject: [PATCH 45/96] MongoDbContextRegistrationOptions to AbpMongoDbContextRegistrationOptions --- .../AbpMongoDbServiceCollectionExtensions.cs | 4 ++-- .../AbpMongoDbContextRegistrationOptions.cs | 14 ++++++++++++++ ...IAbpMongoDbContextRegistrationOptionsBuilder.cs | 9 +++++++++ .../IMongoDbContextRegistrationOptionsBuilder.cs | 9 --------- .../MongoDbContextRegistrationOptions.cs | 14 -------------- .../MongoDbRepositoryRegistrar.cs | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbContextRegistrationOptions.cs create mode 100644 framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IAbpMongoDbContextRegistrationOptionsBuilder.cs delete mode 100644 framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs delete mode 100644 framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs diff --git a/framework/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs b/framework/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs index f498fd5e1d..1ad31d2de9 100644 --- a/framework/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs @@ -7,10 +7,10 @@ namespace Microsoft.Extensions.DependencyInjection { public static class AbpMongoDbServiceCollectionExtensions { - public static IServiceCollection AddMongoDbContext(this IServiceCollection services, Action optionsBuilder = null) //Created overload instead of default parameter + public static IServiceCollection AddMongoDbContext(this IServiceCollection services, Action optionsBuilder = null) //Created overload instead of default parameter where TMongoDbContext : AbpMongoDbContext { - var options = new MongoDbContextRegistrationOptions(typeof(TMongoDbContext), services); + var options = new AbpMongoDbContextRegistrationOptions(typeof(TMongoDbContext), services); optionsBuilder?.Invoke(options); foreach (var dbContextType in options.ReplacedDbContextTypes) diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbContextRegistrationOptions.cs new file mode 100644 index 0000000000..42f2f74e4e --- /dev/null +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/AbpMongoDbContextRegistrationOptions.cs @@ -0,0 +1,14 @@ +using System; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.MongoDB.DependencyInjection +{ + public class AbpMongoDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IAbpMongoDbContextRegistrationOptionsBuilder + { + public AbpMongoDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) + : base(originalDbContextType, services) + { + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IAbpMongoDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IAbpMongoDbContextRegistrationOptionsBuilder.cs new file mode 100644 index 0000000000..5600d47b7f --- /dev/null +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IAbpMongoDbContextRegistrationOptionsBuilder.cs @@ -0,0 +1,9 @@ +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.MongoDB.DependencyInjection +{ + public interface IAbpMongoDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs deleted file mode 100644 index 0e82c8755c..0000000000 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.MongoDB.DependencyInjection -{ - public interface IMongoDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder - { - - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs deleted file mode 100644 index 2915a3ccdd..0000000000 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.MongoDB.DependencyInjection -{ - public class MongoDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IMongoDbContextRegistrationOptionsBuilder - { - public MongoDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) - : base(originalDbContextType, services) - { - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbRepositoryRegistrar.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbRepositoryRegistrar.cs index 096be11ce7..8fdddf4cf2 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbRepositoryRegistrar.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbRepositoryRegistrar.cs @@ -5,9 +5,9 @@ using Volo.Abp.Domain.Repositories.MongoDB; namespace Volo.Abp.MongoDB.DependencyInjection { - public class MongoDbRepositoryRegistrar : RepositoryRegistrarBase + public class MongoDbRepositoryRegistrar : RepositoryRegistrarBase { - public MongoDbRepositoryRegistrar(MongoDbContextRegistrationOptions options) + public MongoDbRepositoryRegistrar(AbpMongoDbContextRegistrationOptions options) : base(options) { From 88b030b5617cc9ebeae5e153a7d6ae691c3ad00a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:39:55 +0300 Subject: [PATCH 46/96] MemoryDbContextRegistrationOptions to AbpMemoryDbContextRegistrationOptions --- .../AbpMemoryDbServiceCollectionExtensions.cs | 4 ++-- .../AbpMemoryDbContextRegistrationOptions.cs | 14 ++++++++++++++ ...AbpMemoryDbContextRegistrationOptionsBuilder.cs | 9 +++++++++ .../IMemoryDbContextRegistrationOptionsBuilder.cs | 9 --------- .../MemoryDbContextRegistrationOptions.cs | 14 -------------- .../MemoryDbRepositoryRegistrar.cs | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/AbpMemoryDbContextRegistrationOptions.cs create mode 100644 framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IAbpMemoryDbContextRegistrationOptionsBuilder.cs delete mode 100644 framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs delete mode 100644 framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs diff --git a/framework/src/Volo.Abp.MemoryDb/Microsoft/Extensions/DependencyInjection/AbpMemoryDbServiceCollectionExtensions.cs b/framework/src/Volo.Abp.MemoryDb/Microsoft/Extensions/DependencyInjection/AbpMemoryDbServiceCollectionExtensions.cs index 621f20ed25..3cab95cb03 100644 --- a/framework/src/Volo.Abp.MemoryDb/Microsoft/Extensions/DependencyInjection/AbpMemoryDbServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.MemoryDb/Microsoft/Extensions/DependencyInjection/AbpMemoryDbServiceCollectionExtensions.cs @@ -7,10 +7,10 @@ namespace Microsoft.Extensions.DependencyInjection { public static class AbpMemoryDbServiceCollectionExtensions { - public static IServiceCollection AddMemoryDbContext(this IServiceCollection services, Action optionsBuilder = null) + public static IServiceCollection AddMemoryDbContext(this IServiceCollection services, Action optionsBuilder = null) where TMemoryDbContext : MemoryDbContext { - var options = new MemoryDbContextRegistrationOptions(typeof(TMemoryDbContext), services); + var options = new AbpMemoryDbContextRegistrationOptions(typeof(TMemoryDbContext), services); optionsBuilder?.Invoke(options); if (options.DefaultRepositoryDbContextType != typeof(TMemoryDbContext)) diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/AbpMemoryDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/AbpMemoryDbContextRegistrationOptions.cs new file mode 100644 index 0000000000..6e22d1d845 --- /dev/null +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/AbpMemoryDbContextRegistrationOptions.cs @@ -0,0 +1,14 @@ +using System; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.MemoryDb.DependencyInjection +{ + public class AbpMemoryDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IAbpMemoryDbContextRegistrationOptionsBuilder + { + public AbpMemoryDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) + : base(originalDbContextType, services) + { + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IAbpMemoryDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IAbpMemoryDbContextRegistrationOptionsBuilder.cs new file mode 100644 index 0000000000..1c74c24dba --- /dev/null +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IAbpMemoryDbContextRegistrationOptionsBuilder.cs @@ -0,0 +1,9 @@ +using Volo.Abp.DependencyInjection; + +namespace Volo.Abp.MemoryDb.DependencyInjection +{ + public interface IAbpMemoryDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder + { + + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs deleted file mode 100644 index 74eb0317f7..0000000000 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.MemoryDb.DependencyInjection -{ - public interface IMemoryDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder - { - - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs deleted file mode 100644 index a605576bbd..0000000000 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.MemoryDb.DependencyInjection -{ - public class MemoryDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IMemoryDbContextRegistrationOptionsBuilder - { - public MemoryDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) - : base(originalDbContextType, services) - { - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbRepositoryRegistrar.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbRepositoryRegistrar.cs index fa238a780d..824415017f 100644 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbRepositoryRegistrar.cs +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbRepositoryRegistrar.cs @@ -5,9 +5,9 @@ using Volo.Abp.Domain.Repositories.MemoryDb; namespace Volo.Abp.MemoryDb.DependencyInjection { - public class MemoryDbRepositoryRegistrar : RepositoryRegistrarBase + public class MemoryDbRepositoryRegistrar : RepositoryRegistrarBase { - public MemoryDbRepositoryRegistrar(MemoryDbContextRegistrationOptions options) + public MemoryDbRepositoryRegistrar(AbpMemoryDbContextRegistrationOptions options) : base(options) { } From f9e97319fb94d6210fa06fbe52cb6b86498812fd Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:41:03 +0300 Subject: [PATCH 47/96] ExceptionLocalizationOptions to AbpExceptionLocalizationOptions --- .../AbpIoLocalization/AbpIoLocalizationModule.cs | 2 +- .../ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs | 4 ++-- ...alizationOptions.cs => AbpExceptionLocalizationOptions.cs} | 4 ++-- .../Volo/Abp/Account/AbpAccountApplicationContractsModule.cs | 2 +- .../Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs | 2 +- .../Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs | 2 +- .../Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs | 2 +- .../BookManagementDomainSharedModule.cs | 2 +- .../ProductManagement/ProductManagementDomainModule.cs | 2 +- .../MyProjectNameDomainSharedModule.cs | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/{ExceptionLocalizationOptions.cs => AbpExceptionLocalizationOptions.cs} (82%) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs index d32497b394..19c707bfad 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs @@ -24,7 +24,7 @@ namespace AbpIoLocalization options.FileSets.AddEmbedded("AbpIoLocalization"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.AbpIo.Commercial", typeof(AbpIoCommercialResource)); options.MapCodeNamespace("Volo.AbpIo.Domain", typeof(AbpIoBaseResource)); diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs index d1ae5dd59a..5bf59b0cc9 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs @@ -21,13 +21,13 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling { public bool SendAllExceptionsToClients { get; set; } = false; - protected ExceptionLocalizationOptions LocalizationOptions { get; } + protected AbpExceptionLocalizationOptions LocalizationOptions { get; } protected IStringLocalizerFactory StringLocalizerFactory { get; } protected IStringLocalizer L { get; } protected IServiceProvider ServiceProvider { get; } public DefaultExceptionToErrorInfoConverter( - IOptions localizationOptions, + IOptions localizationOptions, IStringLocalizerFactory stringLocalizerFactory, IStringLocalizer abpUiStringLocalizer, IServiceProvider serviceProvider) diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/ExceptionLocalizationOptions.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/AbpExceptionLocalizationOptions.cs similarity index 82% rename from framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/ExceptionLocalizationOptions.cs rename to framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/AbpExceptionLocalizationOptions.cs index 1105b7146c..9fd7f5dd62 100644 --- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/ExceptionLocalizationOptions.cs +++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/ExceptionHandling/AbpExceptionLocalizationOptions.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; namespace Volo.Abp.Localization.ExceptionHandling { - public class ExceptionLocalizationOptions + public class AbpExceptionLocalizationOptions { public Dictionary ErrorCodeNamespaceMappings { get; } - public ExceptionLocalizationOptions() + public AbpExceptionLocalizationOptions() { ErrorCodeNamespaceMappings = new Dictionary(); } diff --git a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs index a14a2bce0c..1d3ced4cdb 100644 --- a/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs +++ b/modules/account/src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.Account .AddVirtualJson("/Volo/Abp/Account/Localization/Resources"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.Account", typeof(AccountResource)); }); diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs index 22b845eeaa..e8e961d3b4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.FeatureManagement options.ProviderPolicies[TenantFeatureValueProvider.ProviderName] = "AbpTenantManagement.Tenants.ManageFeatures"; }); - Configure(options => + Configure(options => { options.MapCodeNamespace("AbpFeatureManagement", typeof(AbpFeatureManagementResource)); }); diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs index bdbf5dacb6..5133e0dc03 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/AbpIdentityDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.Identity ).AddVirtualJson("/Volo/Abp/Identity/Localization"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.Abp.Identity", typeof(IdentityResource)); }); diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs index 5cd92d8083..983ffcb071 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/AbpIdentityServerDomainSharedModule.cs @@ -27,7 +27,7 @@ namespace Volo.Abp.IdentityServer ).AddVirtualJson("/Volo/Abp/IdentityServer/Localization/Resources"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("Volo.IdentityServer", typeof(AbpIdentityServerResource)); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs index b64b359004..7e56eb6f18 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs @@ -27,7 +27,7 @@ namespace Acme.BookStore.BookManagement .AddVirtualJson("/Localization/BookManagement"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("BookManagement", typeof(BookManagementResource)); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs index c1f4aebf55..85505815dc 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs @@ -28,7 +28,7 @@ namespace ProductManagement options.Resources.Get().AddVirtualJson("/ProductManagement/Localization/Domain"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("ProductManagement", typeof(ProductManagementResource)); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 18d257c65b..2d22b07cdf 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -27,7 +27,7 @@ namespace MyCompanyName.MyProjectName .AddVirtualJson("/Localization/MyProjectName"); }); - Configure(options => + Configure(options => { options.MapCodeNamespace("MyProjectName", typeof(MyProjectNameResource)); }); From 15a79928a00eaf8598d344c2f86382dde72c4c18 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:41:59 +0300 Subject: [PATCH 48/96] RemoteServiceOptions to AbpRemoteServiceOptions --- ...viceCollectionDynamicHttpClientProxyExtensions.cs | 6 +++--- .../Volo/Abp/Http/Client/AbpHttpClientModule.cs | 2 +- ...eServiceOptions.cs => AbpRemoteServiceOptions.cs} | 4 ++-- .../DynamicProxying/DynamicHttpProxyInterceptor.cs | 12 ++++++------ .../AbpAspNetCoreMvcVersioningTestModule.cs | 2 +- .../Volo/Abp/Http/AbpHttpClientTestModule.cs | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) rename framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/{RemoteServiceOptions.cs => AbpRemoteServiceOptions.cs} (73%) diff --git a/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs b/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs index 21212ee16a..b716a9cd9e 100644 --- a/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs +++ b/framework/src/Volo.Abp.Http.Client/Microsoft/Extensions/DependencyInjection/ServiceCollectionDynamicHttpClientProxyExtensions.cs @@ -24,7 +24,7 @@ namespace Microsoft.Extensions.DependencyInjection /// The assembly containing the service interfaces /// /// The name of the remote service configuration to be used by the HTTP Client proxies. - /// See . + /// See . /// /// /// True, to register the HTTP client proxy as the default implementation for the services. @@ -63,7 +63,7 @@ namespace Microsoft.Extensions.DependencyInjection /// Service collection /// /// The name of the remote service configuration to be used by the HTTP Client proxy. - /// See . + /// See . /// /// /// True, to register the HTTP client proxy as the default implementation for the service . @@ -87,7 +87,7 @@ namespace Microsoft.Extensions.DependencyInjection /// Type of the service /// /// The name of the remote service configuration to be used by the HTTP Client proxy. - /// See . + /// See . /// /// /// True, to register the HTTP client proxy as the default implementation for the service . diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs index 234a560e83..f2a7540956 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpHttpClientModule.cs @@ -17,7 +17,7 @@ namespace Volo.Abp.Http.Client public override void ConfigureServices(ServiceConfigurationContext context) { var configuration = context.Services.GetConfiguration(); - Configure(configuration); + Configure(configuration); } } } diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceOptions.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpRemoteServiceOptions.cs similarity index 73% rename from framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceOptions.cs rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpRemoteServiceOptions.cs index a873973329..ef431543ef 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceOptions.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpRemoteServiceOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.Http.Client { - public class RemoteServiceOptions + public class AbpRemoteServiceOptions { public RemoteServiceConfigurationDictionary RemoteServices { get; set; } - public RemoteServiceOptions() + public AbpRemoteServiceOptions() { RemoteServices = new RemoteServiceConfigurationDictionary(); } diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs index 4e976a25cd..4e09e085e7 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs @@ -34,7 +34,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying protected AbpCorrelationIdOptions AbpCorrelationIdOptions { get; } protected IDynamicProxyHttpClientFactory HttpClientFactory { get; } protected IApiDescriptionFinder ApiDescriptionFinder { get; } - protected RemoteServiceOptions RemoteServiceOptions { get; } + protected AbpRemoteServiceOptions AbpRemoteServiceOptions { get; } protected AbpHttpClientOptions ClientOptions { get; } protected IJsonSerializer JsonSerializer { get; } protected IRemoteServiceHttpClientAuthenticator ClientAuthenticator { get; } @@ -51,7 +51,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying public DynamicHttpProxyInterceptor( IDynamicProxyHttpClientFactory httpClientFactory, IOptions clientOptions, - IOptionsSnapshot remoteServiceOptions, + IOptionsSnapshot remoteServiceOptions, IApiDescriptionFinder apiDescriptionFinder, IJsonSerializer jsonSerializer, IRemoteServiceHttpClientAuthenticator clientAuthenticator, @@ -69,7 +69,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying JsonSerializer = jsonSerializer; ClientAuthenticator = clientAuthenticator; ClientOptions = clientOptions.Value; - RemoteServiceOptions = remoteServiceOptions.Value; + AbpRemoteServiceOptions = remoteServiceOptions.Value; Logger = NullLogger>.Instance; } @@ -129,7 +129,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying private async Task MakeRequestAsync(IAbpMethodInvocation invocation) { var clientConfig = ClientOptions.HttpClientProxies.GetOrDefault(typeof(TService)) ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}."); - var remoteServiceConfig = RemoteServiceOptions.RemoteServices.GetConfigurationOrDefault(clientConfig.RemoteServiceName); + var remoteServiceConfig = AbpRemoteServiceOptions.RemoteServices.GetConfigurationOrDefault(clientConfig.RemoteServiceName); var client = HttpClientFactory.Create(clientConfig.RemoteServiceName); @@ -241,8 +241,8 @@ namespace Volo.Abp.Http.Client.DynamicProxying var clientConfig = ClientOptions.HttpClientProxies.GetOrDefault(typeof(TService)) ?? throw new AbpException($"Could not get DynamicHttpClientProxyConfig for {typeof(TService).FullName}."); - return RemoteServiceOptions.RemoteServices.GetOrDefault(clientConfig.RemoteServiceName)?.Version - ?? RemoteServiceOptions.RemoteServices.Default?.Version; + return AbpRemoteServiceOptions.RemoteServices.GetOrDefault(clientConfig.RemoteServiceName)?.Version + ?? AbpRemoteServiceOptions.RemoteServices.Default?.Version; } private async Task ThrowExceptionForResponseAsync(HttpResponseMessage response) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs index 99a155f3b7..b06a90bcfa 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs +++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/AbpAspNetCoreMvcVersioningTestModule.cs @@ -57,7 +57,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Versioning context.Services.AddHttpClientProxies(typeof(AbpAspNetCoreMvcVersioningTestModule).Assembly); - Configure(options => + Configure(options => { options.RemoteServices.Default = new RemoteServiceConfiguration("/"); }); diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/AbpHttpClientTestModule.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/AbpHttpClientTestModule.cs index 2835c086b8..9b2a28ad3e 100644 --- a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/AbpHttpClientTestModule.cs +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/AbpHttpClientTestModule.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.Http context.Services.AddHttpClientProxies(typeof(TestAppModule).Assembly); context.Services.AddHttpClientProxy(); - Configure(options => + Configure(options => { options.RemoteServices.Default = new RemoteServiceConfiguration("/"); }); From 680b9038008faa76383cef3b90b8cc6fcc5b814b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:43:12 +0300 Subject: [PATCH 49/96] RemoteServiceOptions to AbpRemoteServiceOptions cont. --- .../applications/ConsoleClientDemo/ClientDemoService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs b/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs index 43a36383fd..6083368d3e 100644 --- a/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs +++ b/samples/MicroserviceDemo/applications/ConsoleClientDemo/ClientDemoService.cs @@ -15,13 +15,13 @@ namespace ConsoleClientDemo private readonly IIdentityUserAppService _userAppService; private readonly IProductAppService _productAppService; private readonly IIdentityModelAuthenticationService _authenticator; - private readonly RemoteServiceOptions _remoteServiceOptions; + private readonly AbpRemoteServiceOptions _remoteServiceOptions; public ClientDemoService( IIdentityUserAppService userAppService, IProductAppService productAppService, IIdentityModelAuthenticationService authenticator, - IOptions remoteServiceOptions) + IOptions remoteServiceOptions) { _userAppService = userAppService; _authenticator = authenticator; From 585099dbf5eb4fdcf363b041e22a2931c8e34bbc Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:43:29 +0300 Subject: [PATCH 50/96] ApiDescriptionModelOptions to AbpApiDescriptionModelOptions --- .../Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs | 2 +- .../AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs | 4 ++-- .../Volo/Abp/Application/AbpDddApplicationModule.cs | 2 +- ...iptionModelOptions.cs => AbpApiDescriptionModelOptions.cs} | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/{ApiDescriptionModelOptions.cs => AbpApiDescriptionModelOptions.cs} (84%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs index 1c8ae167e3..ebc086dee6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs @@ -57,7 +57,7 @@ namespace Volo.Abp.AspNetCore.Mvc ) ); - Configure(options => + Configure(options => { options.IgnoredInterfaces.AddIfNotContains(typeof(IAsyncActionFilter)); options.IgnoredInterfaces.AddIfNotContains(typeof(IFilterMetadata)); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs index c215fabf97..d9cb936326 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs @@ -25,12 +25,12 @@ namespace Volo.Abp.AspNetCore.Mvc private readonly IApiDescriptionGroupCollectionProvider _descriptionProvider; private readonly AbpAspNetCoreMvcOptions _options; - private readonly ApiDescriptionModelOptions _modelOptions; + private readonly AbpApiDescriptionModelOptions _modelOptions; public AspNetCoreApiDescriptionModelProvider( IApiDescriptionGroupCollectionProvider descriptionProvider, IOptions options, - IOptions modelOptions) + IOptions modelOptions) { _descriptionProvider = descriptionProvider; _options = options.Value; diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs index 14d7bc686f..c5a16ea6bb 100644 --- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs +++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/AbpDddApplicationModule.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.Application { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { //TODO: Should we move related items to their own projects? options.IgnoredInterfaces.AddIfNotContains(typeof(IRemoteService)); diff --git a/framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs b/framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/AbpApiDescriptionModelOptions.cs similarity index 84% rename from framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs rename to framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/AbpApiDescriptionModelOptions.cs index 7170995c42..2ed733a008 100644 --- a/framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/ApiDescriptionModelOptions.cs +++ b/framework/src/Volo.Abp.Http.Abstractions/Volo/Abp/Http/Modeling/AbpApiDescriptionModelOptions.cs @@ -5,11 +5,11 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.Http.Modeling { - public class ApiDescriptionModelOptions + public class AbpApiDescriptionModelOptions { public HashSet IgnoredInterfaces { get; } - public ApiDescriptionModelOptions() + public AbpApiDescriptionModelOptions() { IgnoredInterfaces = new HashSet { From b3687bdb8bbbf85bf17f21f1e594c046e2c49c0d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:44:24 +0300 Subject: [PATCH 51/96] SequentialGuidGeneratorOptions to AbpSequentialGuidGeneratorOptions --- ...ratorOptions.cs => AbpSequentialGuidGeneratorOptions.cs} | 4 ++-- .../Volo/Abp/Guids/SequentialGuidGenerator.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.Guids/Volo/Abp/Guids/{SequentialGuidGeneratorOptions.cs => AbpSequentialGuidGeneratorOptions.cs} (76%) diff --git a/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs b/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/AbpSequentialGuidGeneratorOptions.cs similarity index 76% rename from framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs rename to framework/src/Volo.Abp.Guids/Volo/Abp/Guids/AbpSequentialGuidGeneratorOptions.cs index 913a7a059b..c712f8084b 100644 --- a/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGeneratorOptions.cs +++ b/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/AbpSequentialGuidGeneratorOptions.cs @@ -1,13 +1,13 @@ namespace Volo.Abp.Guids { - public class SequentialGuidGeneratorOptions + public class AbpSequentialGuidGeneratorOptions { /// /// Default value: . /// public SequentialGuidType DefaultSequentialGuidType { get; set; } - public SequentialGuidGeneratorOptions() + public AbpSequentialGuidGeneratorOptions() { DefaultSequentialGuidType = SequentialGuidType.SequentialAtEnd; } diff --git a/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGenerator.cs b/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGenerator.cs index 32fde2ce9c..331ed066a4 100644 --- a/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGenerator.cs +++ b/framework/src/Volo.Abp.Guids/Volo/Abp/Guids/SequentialGuidGenerator.cs @@ -9,15 +9,15 @@ namespace Volo.Abp.Guids /// /// Implements by creating sequential Guids. - /// Use to configure. + /// Use to configure. /// public class SequentialGuidGenerator : IGuidGenerator, ITransientDependency { - public SequentialGuidGeneratorOptions Options { get; } + public AbpSequentialGuidGeneratorOptions Options { get; } private static readonly RandomNumberGenerator RandomNumberGenerator = RandomNumberGenerator.Create(); - public SequentialGuidGenerator(IOptions options) + public SequentialGuidGenerator(IOptions options) { Options = options.Value; } From ae61c6c7186bf2929644cc9adef23671a053d197 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:52:00 +0300 Subject: [PATCH 52/96] ModelBuilderConfigurationOptions to AbpModelBuilderConfigurationOptions --- ...ationOptions.cs => AbpModelBuilderConfigurationOptions.cs} | 4 ++-- .../AbpAuditLoggingModelBuilderConfigurationOptions.cs | 2 +- .../BackgroundJobsModelBuilderConfigurationOptions.cs | 2 +- .../BloggingModelBuilderConfigurationOptions.cs | 2 +- .../DocsModelBuilderConfigurationOptions.cs | 2 +- .../FeatureManagementModelBuilderConfigurationOptions.cs | 2 +- .../IdentityModelBuilderConfigurationOptions.cs | 2 +- .../IdentityServerModelBuilderConfigurationOptions.cs | 2 +- ...AbpPermissionManagementModelBuilderConfigurationOptions.cs | 2 +- .../SettingManagementDbContextModelBuilderExtensions.cs | 2 +- .../AbpTenantManagementModelBuilderConfigurationOptions.cs | 2 +- .../BookManagementModelBuilderConfigurationOptions.cs | 2 +- .../ProductManagementModelBuilderConfigurationOptions.cs | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) rename framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/{ModelBuilderConfigurationOptions.cs => AbpModelBuilderConfigurationOptions.cs} (88%) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/ModelBuilderConfigurationOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpModelBuilderConfigurationOptions.cs similarity index 88% rename from framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/ModelBuilderConfigurationOptions.cs rename to framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpModelBuilderConfigurationOptions.cs index 808ef80bb6..7f3c24b6fb 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/ModelBuilderConfigurationOptions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpModelBuilderConfigurationOptions.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling { - public class ModelBuilderConfigurationOptions + public class AbpModelBuilderConfigurationOptions { [NotNull] public string TablePrefix @@ -19,7 +19,7 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling [CanBeNull] public string Schema { get; set; } - public ModelBuilderConfigurationOptions( + public AbpModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "", [CanBeNull] string schema = null) { diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingModelBuilderConfigurationOptions.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingModelBuilderConfigurationOptions.cs index 1518afe236..404ce00d0b 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingModelBuilderConfigurationOptions.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/AbpAuditLoggingModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.Identity.EntityFrameworkCore { - public class AbpAuditLoggingModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class AbpAuditLoggingModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public AbpAuditLoggingModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsModelBuilderConfigurationOptions.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsModelBuilderConfigurationOptions.cs index 0f59572d6e..47734aa3a3 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsModelBuilderConfigurationOptions.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore { - public class BackgroundJobsModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class BackgroundJobsModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public BackgroundJobsModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "", diff --git a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs index 278208ced6..af888ab402 100644 --- a/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs +++ b/modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/EntityFrameworkCore/BloggingModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Blogging.EntityFrameworkCore { - public class BloggingModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class BloggingModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public BloggingModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "", diff --git a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs index 217345eee2..0baf8b4afe 100644 --- a/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs +++ b/modules/docs/src/Volo.Docs.EntityFrameworkCore/Volo/Docs/EntityFrameworkCore/DocsModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Docs.EntityFrameworkCore { - public class DocsModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class DocsModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public DocsModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementModelBuilderConfigurationOptions.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementModelBuilderConfigurationOptions.cs index 035b6ed341..ba8e38bd61 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementModelBuilderConfigurationOptions.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/FeatureManagementModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.FeatureManagement.EntityFrameworkCore { - public class FeatureManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class FeatureManagementModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public FeatureManagementModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "", diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs index ce27e4c1e9..c78496e0f5 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.Identity.EntityFrameworkCore { - public class IdentityModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class IdentityModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public IdentityModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs index 55dcc06837..918522c3d7 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.IdentityServer.EntityFrameworkCore { - public class IdentityServerModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class IdentityServerModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public IdentityServerModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementModelBuilderConfigurationOptions.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementModelBuilderConfigurationOptions.cs index 3cf4c1755a..1ddfcc9a8f 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementModelBuilderConfigurationOptions.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.PermissionManagement.EntityFrameworkCore { - public class AbpPermissionManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class AbpPermissionManagementModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public AbpPermissionManagementModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContextModelBuilderExtensions.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContextModelBuilderExtensions.cs index e95cb9791a..d0de79aa7e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContextModelBuilderExtensions.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContextModelBuilderExtensions.cs @@ -5,7 +5,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.SettingManagement.EntityFrameworkCore { - public class SettingManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class SettingManagementModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public SettingManagementModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementModelBuilderConfigurationOptions.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementModelBuilderConfigurationOptions.cs index 2c7bba5afe..849ed68bae 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementModelBuilderConfigurationOptions.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.TenantManagement.EntityFrameworkCore { - public class AbpTenantManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class AbpTenantManagementModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public AbpTenantManagementModelBuilderConfigurationOptions( [NotNull] string tablePrefix, diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementModelBuilderConfigurationOptions.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementModelBuilderConfigurationOptions.cs index 385e3e1470..24ebc5a0e7 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementModelBuilderConfigurationOptions.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.EntityFrameworkCore/EntityFrameworkCore/BookManagementModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace Acme.BookStore.BookManagement.EntityFrameworkCore { - public class BookManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class BookManagementModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public BookManagementModelBuilderConfigurationOptions( [NotNull] string tablePrefix = BookManagementConsts.DefaultDbTablePrefix, diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.EntityFrameworkCore/ProductManagement/EntityFrameworkCore/ProductManagementModelBuilderConfigurationOptions.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.EntityFrameworkCore/ProductManagement/EntityFrameworkCore/ProductManagementModelBuilderConfigurationOptions.cs index 7fdb8f9532..3d1b5a88d6 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.EntityFrameworkCore/ProductManagement/EntityFrameworkCore/ProductManagementModelBuilderConfigurationOptions.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.EntityFrameworkCore/ProductManagement/EntityFrameworkCore/ProductManagementModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace ProductManagement.EntityFrameworkCore { - public class ProductManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class ProductManagementModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public ProductManagementModelBuilderConfigurationOptions( [NotNull] string tablePrefix = ProductManagementConsts.DefaultDbTablePrefix, From 8503f9b6ac165c1c396ec8cf56330b4792b82044 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:53:03 +0300 Subject: [PATCH 53/96] EntityOptions to AbpEntityOptions --- .../EntityFrameworkCore/EfCoreRepository.cs | 14 +++++++------- .../AbpDbContextRegistrationOptions.cs | 8 ++++---- .../{EntityOptions.cs => AbpEntityOptions.cs} | 18 +++++++++--------- .../IAbpDbContextRegistrationOptionsBuilder.cs | 2 +- ...jectNameModelBuilderConfigurationOptions.cs | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) rename framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/{EntityOptions.cs => AbpEntityOptions.cs} (58%) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs index e26624747c..bfedcf2d66 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs @@ -23,20 +23,20 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore protected virtual TDbContext DbContext => _dbContextProvider.GetDbContext(); - protected virtual EntityOptions EntityOptions => _entityOptionsLazy.Value; + protected virtual AbpEntityOptions AbpEntityOptions => _entityOptionsLazy.Value; private readonly IDbContextProvider _dbContextProvider; - private readonly Lazy> _entityOptionsLazy; + private readonly Lazy> _entityOptionsLazy; public EfCoreRepository(IDbContextProvider dbContextProvider) { _dbContextProvider = dbContextProvider; - _entityOptionsLazy = new Lazy>( + _entityOptionsLazy = new Lazy>( () => ServiceProvider - .GetRequiredService>() + .GetRequiredService>() .Value - .GetOrNull() ?? EntityOptions.Empty + .GetOrNull() ?? AbpEntityOptions.Empty ); } @@ -194,12 +194,12 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore public override IQueryable WithDetails() { - if (EntityOptions.DefaultWithDetailsFunc == null) + if (AbpEntityOptions.DefaultWithDetailsFunc == null) { return base.WithDetails(); } - return EntityOptions.DefaultWithDetailsFunc(GetQueryable()); + return AbpEntityOptions.DefaultWithDetailsFunc(GetQueryable()); } public override IQueryable WithDetails(params Expression>[] propertySelectors) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs index 50f2a4bce5..52b654aa88 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs @@ -8,17 +8,17 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public class AbpDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder { - public Dictionary EntityOptions { get; } + public Dictionary AbpEntityOptions { get; } public AbpDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services) { - EntityOptions = new Dictionary(); + AbpEntityOptions = new Dictionary(); } - public void Entity(Action> optionsAction) where TEntity : IEntity + public void Entity(Action> optionsAction) where TEntity : IEntity { - Services.Configure(options => + Services.Configure(options => { options.Entity(optionsAction); }); diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpEntityOptions.cs similarity index 58% rename from framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs rename to framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpEntityOptions.cs index b465dcc667..239ceb04a8 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpEntityOptions.cs @@ -6,30 +6,30 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { - public class EntityOptions + public class AbpEntityOptions where TEntity : IEntity { - public static EntityOptions Empty { get; } = new EntityOptions(); + public static AbpEntityOptions Empty { get; } = new AbpEntityOptions(); public Func, IQueryable> DefaultWithDetailsFunc { get; set; } } - public class EntityOptions + public class AbpEntityOptions { private readonly IDictionary _options; - public EntityOptions() + public AbpEntityOptions() { _options = new Dictionary(); } - public EntityOptions GetOrNull() + public AbpEntityOptions GetOrNull() where TEntity : IEntity { - return _options.GetOrDefault(typeof(TEntity)) as EntityOptions; + return _options.GetOrDefault(typeof(TEntity)) as AbpEntityOptions; } - public void Entity([NotNull] Action> optionsAction) + public void Entity([NotNull] Action> optionsAction) where TEntity : IEntity { Check.NotNull(optionsAction, nameof(optionsAction)); @@ -37,8 +37,8 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection optionsAction( _options.GetOrAdd( typeof(TEntity), - () => new EntityOptions() - ) as EntityOptions + () => new AbpEntityOptions() + ) as AbpEntityOptions ); } } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs index b2eb839944..daf1447f2e 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public interface IAbpDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { - void Entity([NotNull] Action> optionsAction) + void Entity([NotNull] Action> optionsAction) where TEntity : IEntity; } } \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs index 445cde72b5..8b3c2a49dd 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling; namespace MyCompanyName.MyProjectName.EntityFrameworkCore { - public class MyProjectNameModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions + public class MyProjectNameModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions { public MyProjectNameModelBuilderConfigurationOptions( [NotNull] string tablePrefix = "", From 9bd045d882958ab1c8096d1ea4d73332dddfc770 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:55:38 +0300 Subject: [PATCH 54/96] DbConnectionOptions to AbpDbConnectionOptions --- framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs | 2 +- .../{DbConnectionOptions.cs => AbpDbConnectionOptions.cs} | 4 ++-- .../Volo/Abp/Data/DefaultConnectionStringResolver.cs | 4 ++-- .../Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs | 2 +- .../Volo/Abp/Data/ConnectionStringResolver_Tests.cs | 2 +- .../Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs | 2 +- .../Volo/Abp/MongoDB/AbpMongoDbTestModule.cs | 2 +- .../MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs | 2 +- .../AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs | 2 +- .../BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs | 2 +- .../app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 +- .../Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs | 2 +- modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs | 2 +- modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 2 +- .../Volo/Docs/MongoDB/DocsMongoDBTestModule.cs | 2 +- .../MongoDB/AbpFeatureManagementMongoDbTestModule.cs | 2 +- .../Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs | 2 +- .../Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs | 2 +- .../MongoDb/AbpPermissionManagementMongoDbTestModule.cs | 2 +- .../MongoDB/AbpSettingManagementMongoDbTestModule.cs | 2 +- .../MongoDb/AbpTenantManagementMongoDbTestModule.cs | 2 +- .../Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs | 2 +- .../MongoDb/BookStoreMongoDbTestModule.cs | 2 +- .../MongoDB/BookManagementMongoDbTestModule.cs | 2 +- .../MongoDb/MyProjectNameMongoDbTestModule.cs | 2 +- .../MongoDB/MyProjectNameMongoDbTestModule.cs | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) rename framework/src/Volo.Abp.Data/Volo/Abp/Data/{DbConnectionOptions.cs => AbpDbConnectionOptions.cs} (69%) diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs index f689518fc1..2414803970 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.Data { var configuration = context.Services.GetConfiguration(); - Configure(configuration); + Configure(configuration); context.Services.AddSingleton(typeof(IDataFilter<>), typeof(DataFilter<>)); } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs similarity index 69% rename from framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs rename to framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs index 9c3e8e856a..863bffb743 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs @@ -1,10 +1,10 @@ namespace Volo.Abp.Data { - public class DbConnectionOptions + public class AbpDbConnectionOptions { public ConnectionStrings ConnectionStrings { get; set; } - public DbConnectionOptions() + public AbpDbConnectionOptions() { ConnectionStrings = new ConnectionStrings(); } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs index b0f1fdf38a..84221fb271 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs @@ -7,9 +7,9 @@ namespace Volo.Abp.Data { public class DefaultConnectionStringResolver : IConnectionStringResolver, ITransientDependency { - protected DbConnectionOptions Options { get; } + protected AbpDbConnectionOptions Options { get; } - public DefaultConnectionStringResolver(IOptionsSnapshot options) + public DefaultConnectionStringResolver(IOptionsSnapshot options) { Options = options.Value; } diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs index fe061d0b8d..d92409fe0d 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.MultiTenancy private readonly IServiceProvider _serviceProvider; public MultiTenantConnectionStringResolver( - IOptionsSnapshot options, + IOptionsSnapshot options, ICurrentTenant currentTenant, IServiceProvider serviceProvider) : base(options) diff --git a/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs index 82a00d8edc..4f4dabf36a 100644 --- a/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs +++ b/framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.Data { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.ConnectionStrings.Default = DefaultConnString; options.ConnectionStrings[Database1Name] = Database1ConnString; diff --git a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs index c7f5d38bbe..7e5d9fcb6b 100644 --- a/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs +++ b/framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.MemoryDb { var connStr = Guid.NewGuid().ToString(); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connStr; }); diff --git a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs index 383fea8a91..86620366b3 100644 --- a/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs +++ b/framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs index aea2810d5e..a6e5fab1c8 100644 --- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs +++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs @@ -25,7 +25,7 @@ namespace Volo.Abp.Data.MultiTenancy protected override void BeforeAddApplication(IServiceCollection services) { - services.Configure(options => + services.Configure(options => { options.ConnectionStrings.Default = "default-value"; options.ConnectionStrings["db1"] = "db1-default-value"; diff --git a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs index f5cedd3cf5..7c70d720ec 100644 --- a/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs +++ b/modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.AuditLogging.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs index 4df77e4e5a..e8eba4eb12 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.BackgroundJobs.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index e6f266a433..5037d4dc31 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -66,7 +66,7 @@ namespace Volo.BloggingTestApp options.RoutePrefix = null; }); - Configure(options => + Configure(options => { #if MONGODB const string connStringName = "MongoDb"; diff --git a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs index a782b23354..4c4b34ef54 100644 --- a/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs +++ b/modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Blogging.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs b/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs index 07aece7a5e..66c2130b35 100644 --- a/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs +++ b/modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs @@ -15,7 +15,7 @@ namespace VoloDocs.Migrator context.Services.AddAbpDbContext(); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = configuration["ConnectionString"]; }); diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 54ff29fea1..16869e1b87 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -68,7 +68,7 @@ namespace VoloDocs.Web options.RoutePrefix = null; }); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = configuration["ConnectionString"]; }); diff --git a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs index aa451f045e..c5fef83ddb 100644 --- a/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs +++ b/modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Docs.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs index df3b64a7de..00b5b22871 100644 --- a/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs +++ b/modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.FeatureManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs index 8025ef7661..6e9f3806a2 100644 --- a/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs +++ b/modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Identity.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs index de8dc5690e..ebfa34404d 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs +++ b/modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.IdentityServer "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs index d36516b887..d3d4d5d6e9 100644 --- a/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs +++ b/modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.PermissionManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs index d0d8b35415..1b9faefdbd 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.SettingManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs index c9e72adaa2..911839d510 100644 --- a/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs +++ b/modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.TenantManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs b/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs index c503db6112..a2235ee03e 100644 --- a/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs +++ b/modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.Users.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs index 9a2eacad43..4602f9c727 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace Acme.BookStore.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs index 23dd76cc2f..09b6c8f1b1 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace Acme.BookStore.BookManagement.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs index dad85e765b..270ad2102c 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs @@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs index b02f017a01..149db59bcc 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs @@ -20,7 +20,7 @@ namespace MyCompanyName.MyProjectName.MongoDB "Db_" + Guid.NewGuid().ToString("N"); - Configure(options => + Configure(options => { options.ConnectionStrings.Default = connectionString; }); From df7144498cae52623c5e320c1916a96418e0e593 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 15:58:00 +0300 Subject: [PATCH 55/96] DataFilterOptions to AbpDataFilterOptions --- .../Data/{DataFilterOptions.cs => AbpDataFilterOptions.cs} | 4 ++-- framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename framework/src/Volo.Abp.Data/Volo/Abp/Data/{DataFilterOptions.cs => AbpDataFilterOptions.cs} (76%) diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilterOptions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataFilterOptions.cs similarity index 76% rename from framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilterOptions.cs rename to framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataFilterOptions.cs index dbf5187c73..5d3a16d034 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilterOptions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataFilterOptions.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; namespace Volo.Abp.Data { - public class DataFilterOptions + public class AbpDataFilterOptions { public Dictionary DefaultStates { get; } - public DataFilterOptions() + public AbpDataFilterOptions() { DefaultStates = new Dictionary(); } diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs index 73741dcfcb..b6770adff4 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DataFilter.cs @@ -61,11 +61,11 @@ namespace Volo.Abp.Data } } - private readonly DataFilterOptions _options; + private readonly AbpDataFilterOptions _options; private readonly AsyncLocal _filter; - public DataFilter(IOptions options) + public DataFilter(IOptions options) { _options = options.Value; _filter = new AsyncLocal(); From 689b54f91419bca234f5b57d7e985d2cba52beee Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:00:34 +0300 Subject: [PATCH 56/96] PermissionOptions to AbpPermissionOptions --- .../Volo/Abp/Authorization/AbpAuthorizationModule.cs | 4 ++-- .../{PermissionOptions.cs => AbpPermissionOptions.cs} | 4 ++-- .../Authorization/Permissions/PermissionDefinitionManager.cs | 4 ++-- .../Permissions/PermissionValueProviderManager.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/{PermissionOptions.cs => AbpPermissionOptions.cs} (84%) diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs index 5a9c3fa4db..86b2b18d04 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.Authorization context.Services.AddSingleton(); - Configure(options => + Configure(options => { options.ValueProviders.Add(); options.ValueProviders.Add(); @@ -49,7 +49,7 @@ namespace Volo.Abp.Authorization } }); - services.Configure(options => + services.Configure(options => { options.DefinitionProviders.AddIfNotContains(definitionProviders); }); diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionOptions.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/AbpPermissionOptions.cs similarity index 84% rename from framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionOptions.cs rename to framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/AbpPermissionOptions.cs index 30c1170e49..ce9dc06798 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionOptions.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/AbpPermissionOptions.cs @@ -2,13 +2,13 @@ namespace Volo.Abp.Authorization.Permissions { - public class PermissionOptions + public class AbpPermissionOptions { public ITypeList DefinitionProviders { get; } public ITypeList ValueProviders { get; } - public PermissionOptions() + public AbpPermissionOptions() { DefinitionProviders = new TypeList(); ValueProviders = new TypeList(); diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs index bb58089c82..7e193feda0 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionDefinitionManager.cs @@ -16,12 +16,12 @@ namespace Volo.Abp.Authorization.Permissions protected IDictionary PermissionDefinitions => _lazyPermissionDefinitions.Value; private readonly Lazy> _lazyPermissionDefinitions; - protected PermissionOptions Options { get; } + protected AbpPermissionOptions Options { get; } private readonly IServiceProvider _serviceProvider; public PermissionDefinitionManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider) { _serviceProvider = serviceProvider; diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs index 323ccb1c2e..d26297a258 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/PermissionValueProviderManager.cs @@ -12,11 +12,11 @@ namespace Volo.Abp.Authorization.Permissions public IReadOnlyList ValueProviders => _lazyProviders.Value; private readonly Lazy> _lazyProviders; - protected PermissionOptions Options { get; } + protected AbpPermissionOptions Options { get; } public PermissionValueProviderManager( IServiceProvider serviceProvider, - IOptions options) + IOptions options) { Options = options.Value; From 53216526d473f93f296ebec2b8cd516aad70848b Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:01:47 +0300 Subject: [PATCH 57/96] ConventionalControllerOptions to AbpConventionalControllerOptions --- .../Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs | 4 ++-- ...rollerOptions.cs => AbpConventionalControllerOptions.cs} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/{ConventionalControllerOptions.cs => AbpConventionalControllerOptions.cs} (78%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs index 6dec2fde14..fb29e17496 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs @@ -4,11 +4,11 @@ namespace Volo.Abp.AspNetCore.Mvc { public class AbpAspNetCoreMvcOptions { - public ConventionalControllerOptions ConventionalControllers { get; } + public AbpConventionalControllerOptions ConventionalControllers { get; } public AbpAspNetCoreMvcOptions() { - ConventionalControllers = new ConventionalControllerOptions(); + ConventionalControllers = new AbpConventionalControllerOptions(); } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalControllerOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalControllerOptions.cs similarity index 78% rename from framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalControllerOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalControllerOptions.cs index a574716ef1..e28ff37717 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalControllerOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalControllerOptions.cs @@ -7,13 +7,13 @@ using Volo.Abp.Http.Modeling; namespace Volo.Abp.AspNetCore.Mvc.Conventions { - public class ConventionalControllerOptions + public class AbpConventionalControllerOptions { public ConventionalControllerSettingList ConventionalControllerSettings { get; } public List FormBodyBindingIgnoredTypes { get; } - public ConventionalControllerOptions() + public AbpConventionalControllerOptions() { ConventionalControllerSettings = new ConventionalControllerSettingList(); @@ -23,7 +23,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions }; } - public ConventionalControllerOptions Create(Assembly assembly, [CanBeNull] Action optionsAction = null) + public AbpConventionalControllerOptions Create(Assembly assembly, [CanBeNull] Action optionsAction = null) { var setting = new ConventionalControllerSetting(assembly, ModuleApiDescriptionModel.DefaultRootPath); optionsAction?.Invoke(setting); From b19acf5d284a365c86c4b6ad76e501b26d69453d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:03:03 +0300 Subject: [PATCH 58/96] ThemingOptions to AbpThemingOptions --- .../AbpAspNetCoreMvcUIBasicThemeModule.cs | 2 +- .../UI/Theming/{ThemingOptions.cs => AbpThemingOptions.cs} | 4 ++-- .../Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs | 6 +++--- .../app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 +- modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/{ThemingOptions.cs => AbpThemingOptions.cs} (76%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs index 1d4e99d089..ec2a323a05 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.Themes.Add(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/AbpThemingOptions.cs similarity index 76% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/AbpThemingOptions.cs index 58de144e88..3214c30367 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/AbpThemingOptions.cs @@ -1,12 +1,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theming { - public class ThemingOptions + public class AbpThemingOptions { public ThemeDictionary Themes { get; } public string DefaultThemeName { get; set; } - public ThemingOptions() + public AbpThemingOptions() { Themes = new ThemeDictionary(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs index e5f4329b47..3af9d29b89 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theming { public class DefaultThemeSelector : IThemeSelector, ITransientDependency { - protected ThemingOptions Options { get; } + protected AbpThemingOptions Options { get; } - public DefaultThemeSelector(IOptions options) + public DefaultThemeSelector(IOptions options) { Options = options.Value; } @@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theming { if (!Options.Themes.Any()) { - throw new AbpException($"No theme registered! Use {nameof(ThemingOptions)} to register themes."); + throw new AbpException($"No theme registered! Use {nameof(AbpThemingOptions)} to register themes."); } if (Options.DefaultThemeName == null) diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 5037d4dc31..4fcdb5ea25 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -119,7 +119,7 @@ namespace Volo.BloggingTestApp options.SupportedUICultures = cultures; }); - Configure(options => + Configure(options => { options.DefaultThemeName = BasicTheme.Name; }); diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 16869e1b87..3825bb25a8 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -124,7 +124,7 @@ namespace VoloDocs.Web .AddVirtualJson("/Localization/Resources/VoloDocs/Web"); }); - Configure(options => + Configure(options => { options.DefaultThemeName = BasicTheme.Name; }); From 52f6668ff7761e63a20b4df3a9ae286c501e4780 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:04:27 +0300 Subject: [PATCH 59/96] ToolbarOptions to AbpToolbarOptions --- .../AbpAspNetCoreMvcUIBasicThemeModule.cs | 2 +- .../Toolbars/{ToolbarOptions.cs => AbpToolbarOptions.cs} | 4 ++-- .../Toolbars/ToolbarManager.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/{ToolbarOptions.cs => AbpToolbarOptions.cs} (81%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs index ec2a323a05..19ff484152 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs @@ -43,7 +43,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic"); }); - Configure(options => + Configure(options => { options.Contributors.Add(new BasicThemeMainTopToolbarContributor()); }); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/AbpToolbarOptions.cs similarity index 81% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/AbpToolbarOptions.cs index e830f3fcf6..b4d010c608 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/AbpToolbarOptions.cs @@ -3,12 +3,12 @@ using JetBrains.Annotations; namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars { - public class ToolbarOptions + public class AbpToolbarOptions { [NotNull] public List Contributors { get; } - public ToolbarOptions() + public AbpToolbarOptions() { Contributors = new List(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs index 77fbd67534..f1ac30779a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Toolbars/ToolbarManager.cs @@ -10,11 +10,11 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars public class ToolbarManager : IToolbarManager, ITransientDependency { protected IThemeManager ThemeManager { get; } - protected ToolbarOptions Options { get; } + protected AbpToolbarOptions Options { get; } protected IServiceProvider ServiceProvider { get; } public ToolbarManager( - IOptions options, + IOptions options, IServiceProvider serviceProvider, IThemeManager themeManager) { From 0135c95f7d9269fbca33b10eab8cee6bac65e427 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:04:46 +0300 Subject: [PATCH 60/96] ToolbarOptions to AbpToolbarOptions cont. --- modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs index 288439a97a..6df4e43c07 100644 --- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs +++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs @@ -45,7 +45,7 @@ namespace Volo.Abp.Account.Web options.MenuContributors.Add(new AbpAccountUserMenuContributor()); }); - Configure(options => + Configure(options => { options.Contributors.Add(new AccountModuleToolbarContributor()); }); From 4db0cf61dce712eb9010c252cef60a4bb899da88 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:05:39 +0300 Subject: [PATCH 61/96] BundlingOptions to AbpBundlingOptions --- .../Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs | 4 ++-- .../Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs | 4 ++-- .../Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs | 4 ++-- .../Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs | 2 +- .../Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs | 2 +- .../UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs | 2 +- .../AbpAspNetCoreMvcUIBasicThemeModule.cs | 2 +- .../AbpAspNetCoreMvcUiThemeSharedModule.cs | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs index 2d38b95233..48290291bf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleManager.cs @@ -21,7 +21,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling { public ILogger Logger { get; set; } - protected readonly BundlingOptions Options; + protected readonly AbpBundlingOptions Options; protected readonly AbpBundleContributorOptions ContributorOptions; protected readonly IWebContentFileProvider WebContentFileProvider; protected readonly IWebHostEnvironment HostingEnvironment; @@ -33,7 +33,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling protected readonly IWebRequestResources RequestResources; public BundleManager( - IOptions options, + IOptions options, IOptions contributorOptions, IScriptBundler scriptBundler, IStyleBundler styleBundler, diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs index b762e87631..bc0fbcb3d2 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundlingOptions.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling { - public class BundlingOptions + public class AbpBundlingOptions { public BundleConfigurationCollection StyleBundles { get; set; } @@ -18,7 +18,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling /// public BundlingMode Mode { get; set; } = BundlingMode.Auto; - public BundlingOptions() + public AbpBundlingOptions() { StyleBundles = new BundleConfigurationCollection(); ScriptBundles = new BundleConfigurationCollection(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs index 981da4e4da..8eb6903592 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperResourceService.cs @@ -20,12 +20,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers protected IBundleManager BundleManager { get; } protected IWebContentFileProvider WebContentFileProvider { get; } protected IWebHostEnvironment HostingEnvironment { get; } - protected readonly BundlingOptions Options; + protected readonly AbpBundlingOptions Options; protected AbpTagHelperResourceService( IBundleManager bundleManager, IWebContentFileProvider webContentFileProvider, - IOptions options, + IOptions options, IWebHostEnvironment hostingEnvironment) { BundleManager = bundleManager; diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs index 8c8e2abc5a..ae69dddbc7 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperScriptService.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers public AbpTagHelperScriptService( IBundleManager bundleManager, IWebContentFileProvider webContentFileProvider, - IOptions options, + IOptions options, IWebHostEnvironment hostingEnvironment ) : base( bundleManager, diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs index 400a75553f..60d45d8f2f 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/TagHelpers/AbpTagHelperStyleService.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.TagHelpers public AbpTagHelperStyleService( IBundleManager bundleManager, IWebContentFileProvider webContentFileProvider, - IOptions options, + IOptions options, IWebHostEnvironment hostingEnvironment ) : base( bundleManager, diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs index ecdaf316e4..b01d6d32a1 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/AbpAspNetCoreMvcUiMultiTenancyModule.cs @@ -47,7 +47,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy .AddVirtualJson("/Volo/Abp/AspNetCore/Mvc/UI/MultiTenancy/Localization"); }); - Configure(options => + Configure(options => { options.ScriptBundles .Get(StandardBundles.Scripts.Global) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs index 19ff484152..212967ee4a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs @@ -48,7 +48,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic options.Contributors.Add(new BasicThemeMainTopToolbarContributor()); }); - Configure(options => + Configure(options => { options .StyleBundles diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs index e18eafbf57..8d6955b15b 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared"); }); - Configure(options => + Configure(options => { options .StyleBundles From 02143575e4cebd73e5ba3680149d99cc9fa0647e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:08:27 +0300 Subject: [PATCH 62/96] AspNetCoreMultiTenancyOptions to AbpAspNetCoreMultiTenancyOptions --- ...iTenancyOptions.cs => AbpAspNetCoreMultiTenancyOptions.cs} | 4 ++-- .../AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs | 2 +- .../AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs | 2 +- .../MultiTenancy/QueryStringTenantResolveContributor.cs | 2 +- .../AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs | 2 +- .../AspNetCore/MultiTenancy/TenantResolveContextExtensions.cs | 4 ++-- .../Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs | 4 ++-- .../Client/DynamicProxying/DynamicHttpProxyInterceptor.cs | 2 +- .../AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs | 4 ++-- .../AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) rename framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/{AspNetCoreMultiTenancyOptions.cs => AbpAspNetCoreMultiTenancyOptions.cs} (77%) diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancyOptions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs similarity index 77% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancyOptions.cs rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs index b985aae73e..63b83885f9 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancyOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyOptions.cs @@ -2,14 +2,14 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { - public class AspNetCoreMultiTenancyOptions + public class AbpAspNetCoreMultiTenancyOptions { /// /// Default: . /// public string TenantKey { get; set; } - public AspNetCoreMultiTenancyOptions() + public AbpAspNetCoreMultiTenancyOptions() { TenantKey = TenantResolverConsts.DefaultTenantKey; } diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs index 3de810a203..7d4a109d9c 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext) { - return httpContext.Request?.Cookies[context.GetAspNetCoreMultiTenancyOptions().TenantKey]; + return httpContext.Request?.Cookies[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey]; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs index 0e93d8f8d0..25487f8b4d 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy return null; } - var tenantIdKey = context.GetAspNetCoreMultiTenancyOptions().TenantKey; + var tenantIdKey = context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey; var tenantIdHeader = httpContext.Request.Headers[tenantIdKey]; if (tenantIdHeader == string.Empty || tenantIdHeader.Count < 1) diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs index 3dcb4c5140..5144088d00 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy return null; } - return httpContext.Request.Query[context.GetAspNetCoreMultiTenancyOptions().TenantKey]; + return httpContext.Request.Query[context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey]; } } } diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs index 4d073db9f8..4548daeb04 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext) { - var tenantId = httpContext.GetRouteValue(context.GetAspNetCoreMultiTenancyOptions().TenantKey); + var tenantId = httpContext.GetRouteValue(context.GetAbpAspNetCoreMultiTenancyOptions().TenantKey); if (tenantId == null) { return null; diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/TenantResolveContextExtensions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/TenantResolveContextExtensions.cs index 3f1d4dfe6c..e57d847a26 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/TenantResolveContextExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/TenantResolveContextExtensions.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { public static class TenantResolveContextExtensions { - public static AspNetCoreMultiTenancyOptions GetAspNetCoreMultiTenancyOptions(this ITenantResolveContext context) + public static AbpAspNetCoreMultiTenancyOptions GetAbpAspNetCoreMultiTenancyOptions(this ITenantResolveContext context) { - return context.ServiceProvider.GetRequiredService>().Value; + return context.ServiceProvider.GetRequiredService>().Value; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs index aa1108d4e5..bfdbb98db8 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Pages/Abp/MultiTenancy/TenantSwitchModal.cshtml.cs @@ -17,11 +17,11 @@ namespace Pages.Abp.MultiTenancy public TenantInfoModel Input { get; set; } protected ITenantStore TenantStore { get; } - protected AspNetCoreMultiTenancyOptions Options { get; } + protected AbpAspNetCoreMultiTenancyOptions Options { get; } public TenantSwitchModalModel( ITenantStore tenantStore, - IOptions options) + IOptions options) { TenantStore = tenantStore; Options = options.Value; diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs index 4e09e085e7..d2b57d32ef 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs @@ -220,7 +220,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying //TenantId if (CurrentTenant.Id.HasValue) { - //TODO: Use AspNetCoreMultiTenancyOptions to get the key + //TODO: Use AbpAspNetCoreMultiTenancyOptions to get the key requestMessage.Headers.Add(TenantResolverConsts.DefaultTenantKey, CurrentTenant.Id.Value.ToString()); } diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs index 310817b8d8..a7a8b21ab1 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs @@ -16,11 +16,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy private readonly Guid _testTenantId = Guid.NewGuid(); private readonly string _testTenantName = "acme"; - private readonly AspNetCoreMultiTenancyOptions _options; + private readonly AbpAspNetCoreMultiTenancyOptions _options; public AspNetCoreMultiTenancy_WithDomainResolver_Tests() { - _options = ServiceProvider.GetRequiredService>().Value; + _options = ServiceProvider.GetRequiredService>().Value; } protected override IWebHostBuilder CreateWebHostBuilder() diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs index 4b5c3f7ecc..50d1f28d3d 100644 --- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs +++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs @@ -17,11 +17,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy private readonly Guid _testTenantId = Guid.NewGuid(); private readonly string _testTenantName = "acme"; - private readonly AspNetCoreMultiTenancyOptions _options; + private readonly AbpAspNetCoreMultiTenancyOptions _options; public AspNetCoreMultiTenancy_Without_DomainResolver_Tests() { - _options = ServiceProvider.GetRequiredService>().Value; + _options = ServiceProvider.GetRequiredService>().Value; } protected override IWebHostBuilder CreateWebHostBuilder() From 971bdd52e744468d4d32b8306e759cf7cda10774 Mon Sep 17 00:00:00 2001 From: Yuze Date: Thu, 17 Oct 2019 12:52:11 +0800 Subject: [PATCH 63/96] Correct typos: automapper to autofac --- docs/en/Getting-Started-AspNetCore-Application.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Getting-Started-AspNetCore-Application.md b/docs/en/Getting-Started-AspNetCore-Application.md index aad2254ab0..f0a715aacd 100644 --- a/docs/en/Getting-Started-AspNetCore-Application.md +++ b/docs/en/Getting-Started-AspNetCore-Application.md @@ -125,7 +125,7 @@ public class AppModule : AbpModule } ```` -3. Update `Program.cs` to use AutoMapper: +3. Update `Program.cs` to use Autofac: ````csharp using Microsoft.AspNetCore.Hosting; From 93e5811d0c320da8360aad940053c187b15668f2 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 18 Oct 2019 08:48:04 +0800 Subject: [PATCH 64/96] Update Getting-Started-Angular-Template.md fix #1932 --- docs/en/Getting-Started-Angular-Template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Getting-Started-Angular-Template.md b/docs/en/Getting-Started-Angular-Template.md index 31186eaa35..5ae006d82e 100644 --- a/docs/en/Getting-Started-Angular-Template.md +++ b/docs/en/Getting-Started-Angular-Template.md @@ -75,7 +75,7 @@ Hit F5 (or Ctrl+F5) to run the application. It will have an output like shown be #### Using EF Core Update-Database Command -Ef Core has `Update-Database` command which creates database if necessary and applies pending migrations. Right click to the `.Web` project and select **Set as StartUp Project**: +Ef Core has `Update-Database` command which creates database if necessary and applies pending migrations. Right click to the `.HttpApi.Host` project and select **Set as StartUp Project**: ![set-as-startup-project](images/set-as-startup-project.png) From e15546d6cdf4eca7201d7ff977113b7883d954bf Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 18 Oct 2019 11:41:59 +0800 Subject: [PATCH 65/96] Remove duplicate ConfigureSwaggerServices method. --- .../MyProjectNameWebModule.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 11f6914baa..7c3494a040 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -77,7 +77,6 @@ namespace MyCompanyName.MyProjectName.Web ConfigureAutoMapper(); ConfigureVirtualFileSystem(hostingEnvironment); ConfigureNavigationServices(configuration); - ConfigureSwaggerServices(context.Services); ConfigureMultiTenancy(); ConfigureSwaggerServices(context.Services); } From 647b863d6f255ad4b85b20943c582f3384935bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 09:53:17 +0300 Subject: [PATCH 66/96] Configure IdentityServer database mapping based on the database provider. --- .../EfCoreDatabaseProvider.cs | 14 +++++++ ...yServerDbContextModelCreatingExtensions.cs | 41 +++++++++++++++++-- ...yServerModelBuilderConfigurationOptions.cs | 3 ++ 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EfCoreDatabaseProvider.cs diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EfCoreDatabaseProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EfCoreDatabaseProvider.cs new file mode 100644 index 0000000000..0ec8e4e469 --- /dev/null +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/EfCoreDatabaseProvider.cs @@ -0,0 +1,14 @@ +namespace Volo.Abp.EntityFrameworkCore +{ + public enum EfCoreDatabaseProvider + { + SqlServer, + MySql, + Oracle, + PostgreSql, + Sqlite, + InMemory, + Cosmos, + Firebird + } +} diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs index a9b1f1fe33..3efeb9cc4c 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; +using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.Modeling; using Volo.Abp.IdentityServer.ApiResources; using Volo.Abp.IdentityServer.Clients; @@ -71,7 +72,14 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore redirectUri.HasKey(x => new { x.ClientId, x.RedirectUri }); - redirectUri.Property(x => x.RedirectUri).HasMaxLength(ClientRedirectUriConsts.RedirectUriMaxLength).IsRequired(); + if (options.DatabaseProvider == EfCoreDatabaseProvider.MySql) + { + redirectUri.Property(x => x.RedirectUri).HasMaxLength(300).IsRequired(); + } + else + { + redirectUri.Property(x => x.RedirectUri).HasMaxLength(ClientRedirectUriConsts.RedirectUriMaxLength).IsRequired(); + } }); builder.Entity(postLogoutRedirectUri => @@ -80,7 +88,14 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore postLogoutRedirectUri.HasKey(x => new { x.ClientId, x.PostLogoutRedirectUri }); - postLogoutRedirectUri.Property(x => x.PostLogoutRedirectUri).HasMaxLength(ClientPostLogoutRedirectUriConsts.PostLogoutRedirectUriMaxLength).IsRequired(); + if (options.DatabaseProvider == EfCoreDatabaseProvider.MySql) + { + postLogoutRedirectUri.Property(x => x.PostLogoutRedirectUri).HasMaxLength(300).IsRequired(); + } + else + { + postLogoutRedirectUri.Property(x => x.PostLogoutRedirectUri).HasMaxLength(ClientPostLogoutRedirectUriConsts.PostLogoutRedirectUriMaxLength).IsRequired(); + } }); builder.Entity(scope => @@ -99,7 +114,16 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore secret.HasKey(x => new { x.ClientId, x.Type, x.Value }); secret.Property(x => x.Type).HasMaxLength(SecretConsts.TypeMaxLength).IsRequired(); - secret.Property(x => x.Value).HasMaxLength(SecretConsts.ValueMaxLength).IsRequired(); + + if (options.DatabaseProvider == EfCoreDatabaseProvider.MySql) + { + secret.Property(x => x.Value).HasMaxLength(300).IsRequired(); + } + else + { + secret.Property(x => x.Value).HasMaxLength(SecretConsts.ValueMaxLength).IsRequired(); + } + secret.Property(x => x.Description).HasMaxLength(SecretConsts.DescriptionMaxLength); }); @@ -214,7 +238,16 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore apiSecret.HasKey(x => new { x.ApiResourceId, x.Type, x.Value }); apiSecret.Property(x => x.Type).HasMaxLength(SecretConsts.TypeMaxLength).IsRequired(); - apiSecret.Property(x => x.Value).HasMaxLength(SecretConsts.ValueMaxLength).IsRequired(); + + if (options.DatabaseProvider == EfCoreDatabaseProvider.MySql) + { + apiSecret.Property(x => x.Value).HasMaxLength(300).IsRequired(); + } + else + { + apiSecret.Property(x => x.Value).HasMaxLength(SecretConsts.ValueMaxLength).IsRequired(); + } + apiSecret.Property(x => x.Description).HasMaxLength(SecretConsts.DescriptionMaxLength); }); diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs index 55dcc06837..1f7cccf472 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerModelBuilderConfigurationOptions.cs @@ -1,10 +1,13 @@ using JetBrains.Annotations; +using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.Modeling; namespace Volo.Abp.IdentityServer.EntityFrameworkCore { public class IdentityServerModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions { + public EfCoreDatabaseProvider? DatabaseProvider { get; set; } + public IdentityServerModelBuilderConfigurationOptions( [NotNull] string tablePrefix, [CanBeNull] string schema) From a36501a9de8d55f366917676d8e002d3d8139334 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 18 Oct 2019 15:27:23 +0800 Subject: [PATCH 67/96] Update PersistedGrant data max length. --- .../Abp/IdentityServer/Grants/PersistedGrantConsts.cs | 2 +- .../IdentityServerDbContextModelCreatingExtensions.cs | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs index 96a268a0e7..ab46d03ece 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain.Shared/Volo/Abp/IdentityServer/Grants/PersistedGrantConsts.cs @@ -9,6 +9,6 @@ // 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K // apparently anything over 4K converts to nvarchar(max) on SqlServer - public const int DataMaxLength = 5000; + public const int DataMaxLength = 50000; } } \ No newline at end of file diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs index 3efeb9cc4c..bd69f6948f 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs @@ -176,7 +176,15 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore grant.Property(x => x.SubjectId).HasMaxLength(PersistedGrantConsts.SubjectIdMaxLength); grant.Property(x => x.ClientId).HasMaxLength(PersistedGrantConsts.ClientIdMaxLength).IsRequired(); grant.Property(x => x.CreationTime).IsRequired(); - grant.Property(x => x.Data).HasMaxLength(PersistedGrantConsts.DataMaxLength).IsRequired(); + + if (options.DatabaseProvider == EfCoreDatabaseProvider.MySql) + { + grant.Property(x => x.Data).HasMaxLength(10000).IsRequired(); + } + else + { + grant.Property(x => x.Data).HasMaxLength(PersistedGrantConsts.DataMaxLength).IsRequired(); + } grant.HasKey(x => x.Key); //TODO: What about Id!!! From 45b8bb10cf78d7b8ce72a0bc3f86cbb9c5d7022d Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Oct 2019 10:54:18 +0300 Subject: [PATCH 68/96] fix: sync.js --- npm/ng-packs/scripts/sync.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/npm/ng-packs/scripts/sync.js b/npm/ng-packs/scripts/sync.js index 858d0e0352..c1a4ac6dbb 100644 --- a/npm/ng-packs/scripts/sync.js +++ b/npm/ng-packs/scripts/sync.js @@ -4,12 +4,13 @@ import execa from 'execa'; (async () => { const { projects } = await fse.readJSON('../angular.json'); - const projectNames = Object.keys(projects); + const projectNames = Object.keys(projects).filter(project => project !== 'dev-app'); - projectNames.forEach(async project => { - const { dependencies: distDependencies, version } = await fse.readJSON(`../dist/${project}/package.json`); + for (let i = 0; i < projectNames.length; i++) { + const project = projectNames[i]; + const { dependencies: distDependencies, version } = await fse.readJson(`../dist/${project}/package.json`); const srcPackagePath = `../packages/${project}/package.json`; - const srcPackage = await fse.readJSON(srcPackagePath); + const srcPackage = await fse.readJson(srcPackagePath); if (distDependencies) { for (const key in srcPackage.dependencies) { @@ -19,11 +20,15 @@ import execa from 'execa'; } } - await fse.writeJSON(srcPackagePath, { ...srcPackage, version }, { spaces: 2 }); - }); + await fse.writeJson(srcPackagePath, { ...srcPackage, version }, { spaces: 2 }); + } - await execa('git', ['add', '../packages/*', '../package.json'], { stdout: 'inherit' }); - await execa('git', ['commit', '-m', 'Update source packages versions'], { stdout: 'inherit' }); + try { + await execa('git', ['add', '../packages/*', '../package.json'], { stdout: 'inherit' }); + await execa('git', ['commit', '-m', '--no-verify', 'Update source packages versions'], { stdout: 'inherit' }); + } catch (error) { + console.error(error.stderr); + } process.exit(0); })(); From 4db042ea68f8d384ccf589c1703159428710622e Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Fri, 18 Oct 2019 11:13:23 +0300 Subject: [PATCH 69/96] add bootstrap-datepicker --- .../BootstrapDatepickerScriptContributor.cs | 43 +++++++++++++++++++ .../BootstrapDatepickerStyleContributor.cs | 13 ++++++ .../SharedThemeGlobalScriptContributor.cs | 3 +- .../SharedThemeGlobalStyleContributor.cs | 3 +- .../package.json | 3 +- .../abp.resourcemapping.js | 8 ++++ npm/packs/bootstrap-datepicker/package.json | 10 +++++ 7 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerStyleContributor.cs create mode 100644 npm/packs/bootstrap-datepicker/abp.resourcemapping.js create mode 100644 npm/packs/bootstrap-datepicker/package.json diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs new file mode 100644 index 0000000000..241822facf --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; +using System.Globalization; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; +using Volo.Abp.Modularity; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago +{ + [DependsOn(typeof(JQueryScriptContributor))] + public class BootstrapDatepickerScriptContributor : BundleContributor + { + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/libs/bootstrap-datepicker/bootstrap-datepicker.min.js"); + } + + public override void ConfigureDynamicResources(BundleConfigurationContext context) + { + var cultureName = CultureInfo.CurrentUICulture.DateTimeFormat.Calendar.AlgorithmType == + CalendarAlgorithmType.LunarCalendar + ? "en" + : CultureInfo.CurrentUICulture.Name; + + if (TryAddCultureFile(context, cultureName)) + { + return; + } + } + + protected virtual bool TryAddCultureFile(BundleConfigurationContext context, string cultureName) + { + var filePath = $"/libs/bootstrap-datepicker/locales/bootstrap-datepicker.{cultureName}.js"; + + if (!context.FileProvider.GetFileInfo(filePath).Exists) + { + return false; + } + + context.Files.AddIfNotContains(filePath); + return true; + } + } +} diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerStyleContributor.cs new file mode 100644 index 0000000000..bc345e34b3 --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerStyleContributor.cs @@ -0,0 +1,13 @@ +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2 +{ + public class BootstrapDatepickerStyleContributor : BundleContributor + { + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/libs/bootstrap-datepicker/bootstrap-datepicker.min.css"); + } + } +} \ No newline at end of file diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs index d067281978..0f4cc752c9 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs @@ -27,7 +27,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling typeof(ToastrScriptBundleContributor), typeof(MalihuCustomScrollbarPluginScriptBundleContributor), typeof(LuxonScriptContributor), - typeof(TimeagoScriptContributor) + typeof(TimeagoScriptContributor), + typeof(BootstrapDatepickerScriptContributor) )] public class SharedThemeGlobalScriptContributor : BundleContributor { diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs index 23107c2d3a..d1703113d0 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalStyleContributor.cs @@ -17,7 +17,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling typeof(ToastrStyleBundleContributor), typeof(Select2StyleContributor), typeof(MalihuCustomScrollbarPluginStyleBundleContributor), - typeof(DatatablesNetBs4StyleContributor) + typeof(DatatablesNetBs4StyleContributor), + typeof(BootstrapDatepickerStyleContributor) )] public class SharedThemeGlobalStyleContributor : BundleContributor { diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index f59f66fb49..3739a97963 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -17,7 +17,8 @@ "@abp/select2": "^0.9.0", "@abp/sweetalert": "^0.9.0", "@abp/timeago": "^0.9.0", - "@abp/toastr": "^0.9.0" + "@abp/toastr": "^0.9.0", + "@abp/bootstrap-datepicker": "^0.9.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/bootstrap-datepicker/abp.resourcemapping.js b/npm/packs/bootstrap-datepicker/abp.resourcemapping.js new file mode 100644 index 0000000000..76b875f37f --- /dev/null +++ b/npm/packs/bootstrap-datepicker/abp.resourcemapping.js @@ -0,0 +1,8 @@ +module.exports = { + mappings: { + "@node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js": "@libs/bootstrap-datepicker/", + "@node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css": "@libs/bootstrap-datepicker/", + "@node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.css.map": "@libs/bootstrap-datepicker/", + "@node_modules/bootstrap-datepicker/dist/locales/*.*": "@libs/bootstrap-datepicker/locales/" + } +} \ No newline at end of file diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json new file mode 100644 index 0000000000..fbf28cc370 --- /dev/null +++ b/npm/packs/bootstrap-datepicker/package.json @@ -0,0 +1,10 @@ +{ + "version": "0.9.0", + "name": "@abp/bootstrap-datepicker", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "bootstrap-datepicker": "^1.9.0" + } +} From 9c0999da97f8246bd66669382aea125406fc9aee Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Fri, 18 Oct 2019 11:15:44 +0300 Subject: [PATCH 70/96] v0.9.2 --- npm/lerna.json | 2 +- npm/ng-packs/dist/account-config/package.json | 2 +- npm/ng-packs/dist/account/package.json | 6 ++-- npm/ng-packs/dist/core/package.json | 2 +- .../dist/feature-management/package.json | 4 +-- .../dist/identity-config/package.json | 2 +- npm/ng-packs/dist/identity/package.json | 8 ++--- .../dist/permission-management/package.json | 4 +-- .../setting-management-config/package.json | 2 +- .../dist/setting-management/package.json | 6 ++-- .../tenant-management-config/package.json | 2 +- .../dist/tenant-management/package.json | 8 ++--- npm/ng-packs/dist/theme-basic/package.json | 4 +-- npm/ng-packs/dist/theme-shared/package.json | 4 +-- npm/packs/anchor-js/package.json | 4 +-- .../package.json | 4 +-- .../package.json | 30 +++++++++---------- npm/packs/aspnetcore.mvc.ui/package.json | 2 +- npm/packs/blogging/package.json | 8 ++--- npm/packs/bootstrap-datepicker/package.json | 2 +- npm/packs/bootstrap/package.json | 4 +-- npm/packs/chart.js/package.json | 2 +- npm/packs/clipboard/package.json | 4 +-- npm/packs/codemirror/package.json | 4 +-- npm/packs/core/package.json | 2 +- npm/packs/datatables.net-bs4/package.json | 4 +-- npm/packs/datatables.net/package.json | 4 +-- npm/packs/docs/package.json | 12 ++++---- npm/packs/flag-icon-css/package.json | 2 +- npm/packs/font-awesome/package.json | 4 +-- npm/packs/highlight.js/package.json | 4 +-- npm/packs/jquery-form/package.json | 4 +-- .../package.json | 4 +-- npm/packs/jquery-validation/package.json | 4 +-- npm/packs/jquery/package.json | 4 +-- npm/packs/lodash/package.json | 4 +-- npm/packs/luxon/package.json | 2 +- .../package.json | 4 +-- npm/packs/markdown-it/package.json | 4 +-- npm/packs/owl.carousel/package.json | 4 +-- npm/packs/popper.js/package.json | 4 +-- npm/packs/prismjs/package.json | 4 +-- npm/packs/select2/package.json | 4 +-- npm/packs/sweetalert/package.json | 4 +-- npm/packs/timeago/package.json | 4 +-- npm/packs/toastr/package.json | 4 +-- npm/packs/tui-editor/package.json | 10 +++---- 47 files changed, 110 insertions(+), 110 deletions(-) diff --git a/npm/lerna.json b/npm/lerna.json index ea738053cb..b345f38c28 100644 --- a/npm/lerna.json +++ b/npm/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.1", + "version": "0.9.2", "packages": [ "ng-packs/dist/*", "packs/*" diff --git a/npm/ng-packs/dist/account-config/package.json b/npm/ng-packs/dist/account-config/package.json index e7e563727b..70c147ae62 100644 --- a/npm/ng-packs/dist/account-config/package.json +++ b/npm/ng-packs/dist/account-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.account.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" }, diff --git a/npm/ng-packs/dist/account/package.json b/npm/ng-packs/dist/account/package.json index aa36c77346..ed62d825fd 100644 --- a/npm/ng-packs/dist/account/package.json +++ b/npm/ng-packs/dist/account/package.json @@ -1,9 +1,9 @@ { "name": "@abp/ng.account", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.account.config": "^0.9.1", - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.account.config": "^0.9.2", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/core/package.json b/npm/ng-packs/dist/core/package.json index d742277289..7345aff622 100644 --- a/npm/ng-packs/dist/core/package.json +++ b/npm/ng-packs/dist/core/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.core", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { "@ngxs/router-plugin": "^3.5.0", "@ngxs/storage-plugin": "^3.5.0", diff --git a/npm/ng-packs/dist/feature-management/package.json b/npm/ng-packs/dist/feature-management/package.json index 92a1219493..dd31b04539 100644 --- a/npm/ng-packs/dist/feature-management/package.json +++ b/npm/ng-packs/dist/feature-management/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.feature-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/identity-config/package.json b/npm/ng-packs/dist/identity-config/package.json index 21fd34470a..2d278efa91 100644 --- a/npm/ng-packs/dist/identity-config/package.json +++ b/npm/ng-packs/dist/identity-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.identity.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" }, diff --git a/npm/ng-packs/dist/identity/package.json b/npm/ng-packs/dist/identity/package.json index bd94335b6d..6a4378cff6 100644 --- a/npm/ng-packs/dist/identity/package.json +++ b/npm/ng-packs/dist/identity/package.json @@ -1,10 +1,10 @@ { "name": "@abp/ng.identity", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.identity.config": "^0.9.1", - "@abp/ng.permission-management": "^0.9.1", - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.identity.config": "^0.9.2", + "@abp/ng.permission-management": "^0.9.2", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/permission-management/package.json b/npm/ng-packs/dist/permission-management/package.json index 8ec740ae06..17f69d66db 100644 --- a/npm/ng-packs/dist/permission-management/package.json +++ b/npm/ng-packs/dist/permission-management/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.permission-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/setting-management-config/package.json b/npm/ng-packs/dist/setting-management-config/package.json index ae90113fbe..92834f1edb 100644 --- a/npm/ng-packs/dist/setting-management-config/package.json +++ b/npm/ng-packs/dist/setting-management-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.setting-management.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" }, diff --git a/npm/ng-packs/dist/setting-management/package.json b/npm/ng-packs/dist/setting-management/package.json index c1fb945d7a..057f1060c9 100644 --- a/npm/ng-packs/dist/setting-management/package.json +++ b/npm/ng-packs/dist/setting-management/package.json @@ -1,9 +1,9 @@ { "name": "@abp/ng.setting-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.setting-management.config": "^0.9.1", - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.setting-management.config": "^0.9.2", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/tenant-management-config/package.json b/npm/ng-packs/dist/tenant-management-config/package.json index fabed5847c..561bbc30f5 100644 --- a/npm/ng-packs/dist/tenant-management-config/package.json +++ b/npm/ng-packs/dist/tenant-management-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.tenant-management.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" }, diff --git a/npm/ng-packs/dist/tenant-management/package.json b/npm/ng-packs/dist/tenant-management/package.json index 19619de243..330eb22a48 100644 --- a/npm/ng-packs/dist/tenant-management/package.json +++ b/npm/ng-packs/dist/tenant-management/package.json @@ -1,10 +1,10 @@ { "name": "@abp/ng.tenant-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.feature-management": "^0.9.1", - "@abp/ng.tenant-management.config": "^0.9.1", - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.feature-management": "^0.9.2", + "@abp/ng.tenant-management.config": "^0.9.2", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/theme-basic/package.json b/npm/ng-packs/dist/theme-basic/package.json index c105a37175..7478632423 100644 --- a/npm/ng-packs/dist/theme-basic/package.json +++ b/npm/ng-packs/dist/theme-basic/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.theme.basic", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", + "@abp/ng.theme.shared": "^0.9.2", "tslib": "^1.9.0" }, "publishConfig": { diff --git a/npm/ng-packs/dist/theme-shared/package.json b/npm/ng-packs/dist/theme-shared/package.json index f13b239df9..d82f55414a 100644 --- a/npm/ng-packs/dist/theme-shared/package.json +++ b/npm/ng-packs/dist/theme-shared/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.theme.shared", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.core": "^0.9.1", + "@abp/ng.core": "^0.9.2", "@angular/cdk": "^8.0.1", "@ng-bootstrap/ng-bootstrap": "^5.1.0", "@ngx-validate/core": "^0.0.7", diff --git a/npm/packs/anchor-js/package.json b/npm/packs/anchor-js/package.json index 248396873f..6bb086440d 100644 --- a/npm/packs/anchor-js/package.json +++ b/npm/packs/anchor-js/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/anchor-js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "anchor-js": "^4.1.1" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json index 51df4a192a..597c3fc476 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.basic/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/aspnetcore.mvc.ui.theme.basic", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^0.9.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "^0.9.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 3739a97963..c2aeee5034 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,24 +1,24 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui": "^0.9.0", - "@abp/bootstrap": "^0.9.0", - "@abp/datatables.net-bs4": "^0.9.0", - "@abp/font-awesome": "^0.9.0", - "@abp/jquery-form": "^0.9.0", - "@abp/jquery-validation-unobtrusive": "^0.9.0", - "@abp/lodash": "^0.9.0", - "@abp/luxon": "^0.9.0", - "@abp/malihu-custom-scrollbar-plugin": "^0.9.0", - "@abp/select2": "^0.9.0", - "@abp/sweetalert": "^0.9.0", - "@abp/timeago": "^0.9.0", - "@abp/toastr": "^0.9.0", - "@abp/bootstrap-datepicker": "^0.9.0" + "@abp/aspnetcore.mvc.ui": "^0.9.2", + "@abp/bootstrap": "^0.9.2", + "@abp/bootstrap-datepicker": "^0.9.2", + "@abp/datatables.net-bs4": "^0.9.2", + "@abp/font-awesome": "^0.9.2", + "@abp/jquery-form": "^0.9.2", + "@abp/jquery-validation-unobtrusive": "^0.9.2", + "@abp/lodash": "^0.9.2", + "@abp/luxon": "^0.9.2", + "@abp/malihu-custom-scrollbar-plugin": "^0.9.2", + "@abp/select2": "^0.9.2", + "@abp/sweetalert": "^0.9.2", + "@abp/timeago": "^0.9.2", + "@abp/toastr": "^0.9.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/aspnetcore.mvc.ui/package.json b/npm/packs/aspnetcore.mvc.ui/package.json index 3306f3fc77..45f08d2d80 100644 --- a/npm/packs/aspnetcore.mvc.ui/package.json +++ b/npm/packs/aspnetcore.mvc.ui/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/aspnetcore.mvc.ui", "publishConfig": { "access": "public" diff --git a/npm/packs/blogging/package.json b/npm/packs/blogging/package.json index 497d9a8575..9a1d2fb240 100644 --- a/npm/packs/blogging/package.json +++ b/npm/packs/blogging/package.json @@ -1,13 +1,13 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/blogging", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.shared": "^0.9.0", - "@abp/owl.carousel": "^0.9.0", - "@abp/tui-editor": "^0.9.0" + "@abp/aspnetcore.mvc.ui.theme.shared": "^0.9.2", + "@abp/owl.carousel": "^0.9.2", + "@abp/tui-editor": "^0.9.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/bootstrap-datepicker/package.json b/npm/packs/bootstrap-datepicker/package.json index fbf28cc370..7ae0fadb78 100644 --- a/npm/packs/bootstrap-datepicker/package.json +++ b/npm/packs/bootstrap-datepicker/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/bootstrap-datepicker", "publishConfig": { "access": "public" diff --git a/npm/packs/bootstrap/package.json b/npm/packs/bootstrap/package.json index 8093ea0ce5..e0a55b7a59 100644 --- a/npm/packs/bootstrap/package.json +++ b/npm/packs/bootstrap/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/bootstrap", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "bootstrap": "^4.1.1" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json index e031b3d5ee..ff51837a1e 100644 --- a/npm/packs/chart.js/package.json +++ b/npm/packs/chart.js/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/chart.js", "publishConfig": { "access": "public" diff --git a/npm/packs/clipboard/package.json b/npm/packs/clipboard/package.json index 6eea1d25e4..467e9745db 100644 --- a/npm/packs/clipboard/package.json +++ b/npm/packs/clipboard/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/clipboard", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "clipboard": "^2.0.4" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/codemirror/package.json b/npm/packs/codemirror/package.json index a120f0a9d8..b347461ed8 100644 --- a/npm/packs/codemirror/package.json +++ b/npm/packs/codemirror/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/codemirror", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "codemirror": "^5.38.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/core/package.json b/npm/packs/core/package.json index 9b1e2cc754..0e9adc165c 100644 --- a/npm/packs/core/package.json +++ b/npm/packs/core/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/core", "publishConfig": { "access": "public" diff --git a/npm/packs/datatables.net-bs4/package.json b/npm/packs/datatables.net-bs4/package.json index ea19108782..6da1395dd2 100644 --- a/npm/packs/datatables.net-bs4/package.json +++ b/npm/packs/datatables.net-bs4/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/datatables.net-bs4", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/datatables.net": "^0.9.0", + "@abp/datatables.net": "^0.9.2", "datatables.net-bs4": "^1.10.16" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/datatables.net/package.json b/npm/packs/datatables.net/package.json index 508ff2f982..9a3a2c3e50 100644 --- a/npm/packs/datatables.net/package.json +++ b/npm/packs/datatables.net/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/datatables.net", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "datatables.net": "^1.10.16" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/docs/package.json b/npm/packs/docs/package.json index b9f2cd55ea..401d41b7cb 100644 --- a/npm/packs/docs/package.json +++ b/npm/packs/docs/package.json @@ -1,15 +1,15 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/docs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/anchor-js": "^0.9.0", - "@abp/clipboard": "^0.9.0", - "@abp/malihu-custom-scrollbar-plugin": "^0.9.0", - "@abp/popper.js": "^0.9.0", - "@abp/prismjs": "^0.9.0" + "@abp/anchor-js": "^0.9.2", + "@abp/clipboard": "^0.9.2", + "@abp/malihu-custom-scrollbar-plugin": "^0.9.2", + "@abp/popper.js": "^0.9.2", + "@abp/prismjs": "^0.9.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/flag-icon-css/package.json b/npm/packs/flag-icon-css/package.json index f7781ebc52..ab8b99c438 100644 --- a/npm/packs/flag-icon-css/package.json +++ b/npm/packs/flag-icon-css/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/flag-icon-css", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 24738d8cea..177447237b 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/font-awesome", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "font-awesome": "^4.7.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/highlight.js/package.json b/npm/packs/highlight.js/package.json index 9204423313..170074e1d3 100644 --- a/npm/packs/highlight.js/package.json +++ b/npm/packs/highlight.js/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/highlight.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0" + "@abp/core": "^0.9.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } diff --git a/npm/packs/jquery-form/package.json b/npm/packs/jquery-form/package.json index 1470e1842a..a04ef61748 100644 --- a/npm/packs/jquery-form/package.json +++ b/npm/packs/jquery-form/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/jquery-form", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^0.9.0", + "@abp/jquery": "^0.9.2", "jquery-form": "^4.2.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/jquery-validation-unobtrusive/package.json b/npm/packs/jquery-validation-unobtrusive/package.json index dfb62b2c6a..15ad2175fc 100644 --- a/npm/packs/jquery-validation-unobtrusive/package.json +++ b/npm/packs/jquery-validation-unobtrusive/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/jquery-validation-unobtrusive", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery-validation": "^0.9.0", + "@abp/jquery-validation": "^0.9.2", "jquery-validation-unobtrusive": "^3.2.9" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/jquery-validation/package.json b/npm/packs/jquery-validation/package.json index e141583ab5..3c68efdf1d 100644 --- a/npm/packs/jquery-validation/package.json +++ b/npm/packs/jquery-validation/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/jquery-validation", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^0.9.0", + "@abp/jquery": "^0.9.2", "jquery-validation": "^1.17.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/jquery/package.json b/npm/packs/jquery/package.json index 90045b6944..78dfdd77fa 100644 --- a/npm/packs/jquery/package.json +++ b/npm/packs/jquery/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/jquery", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "jquery": "^3.3.1" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/lodash/package.json b/npm/packs/lodash/package.json index 95056dc32e..feb5a28818 100644 --- a/npm/packs/lodash/package.json +++ b/npm/packs/lodash/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/lodash", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "lodash": "^4.17.10" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/luxon/package.json b/npm/packs/luxon/package.json index c8e3916a2b..09d0c2b3ec 100644 --- a/npm/packs/luxon/package.json +++ b/npm/packs/luxon/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/luxon", "publishConfig": { "access": "public" diff --git a/npm/packs/malihu-custom-scrollbar-plugin/package.json b/npm/packs/malihu-custom-scrollbar-plugin/package.json index 4949b56c17..546496179c 100644 --- a/npm/packs/malihu-custom-scrollbar-plugin/package.json +++ b/npm/packs/malihu-custom-scrollbar-plugin/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/malihu-custom-scrollbar-plugin", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "malihu-custom-scrollbar-plugin": "^3.1.5" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/markdown-it/package.json b/npm/packs/markdown-it/package.json index 6306a25ca9..6d33abb003 100644 --- a/npm/packs/markdown-it/package.json +++ b/npm/packs/markdown-it/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/markdown-it", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "markdown-it": "^8.4.1" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/owl.carousel/package.json b/npm/packs/owl.carousel/package.json index 2b37c59fb6..3db351c214 100644 --- a/npm/packs/owl.carousel/package.json +++ b/npm/packs/owl.carousel/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/owl.carousel", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "owl.carousel": "^2.3.4" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/popper.js/package.json b/npm/packs/popper.js/package.json index e10f9d4b3c..6a652e66ec 100644 --- a/npm/packs/popper.js/package.json +++ b/npm/packs/popper.js/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/popper.js", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "popper.js": "^1.14.6" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/prismjs/package.json b/npm/packs/prismjs/package.json index 6cdd072181..8b30af5a8c 100644 --- a/npm/packs/prismjs/package.json +++ b/npm/packs/prismjs/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/prismjs", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "prismjs": "^1.15.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/select2/package.json b/npm/packs/select2/package.json index 92779058d4..c9827e0a55 100644 --- a/npm/packs/select2/package.json +++ b/npm/packs/select2/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/select2", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "select2": "^4.0.5" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/sweetalert/package.json b/npm/packs/sweetalert/package.json index 570b220044..6fea27ab82 100644 --- a/npm/packs/sweetalert/package.json +++ b/npm/packs/sweetalert/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/sweetalert", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/core": "^0.9.0", + "@abp/core": "^0.9.2", "sweetalert": "^2.1.0" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/timeago/package.json b/npm/packs/timeago/package.json index fb124c2e3a..e9d3c46b39 100644 --- a/npm/packs/timeago/package.json +++ b/npm/packs/timeago/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/timeago", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^0.9.0", + "@abp/jquery": "^0.9.2", "timeago": "^1.6.3" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/toastr/package.json b/npm/packs/toastr/package.json index 8870a9ba57..aec6b533cb 100644 --- a/npm/packs/toastr/package.json +++ b/npm/packs/toastr/package.json @@ -1,11 +1,11 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/toastr", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/jquery": "^0.9.0", + "@abp/jquery": "^0.9.2", "toastr": "^2.1.4" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" diff --git a/npm/packs/tui-editor/package.json b/npm/packs/tui-editor/package.json index 58a5fcf7b6..10de55c60e 100644 --- a/npm/packs/tui-editor/package.json +++ b/npm/packs/tui-editor/package.json @@ -1,14 +1,14 @@ { - "version": "0.9.0", + "version": "0.9.2", "name": "@abp/tui-editor", "publishConfig": { "access": "public" }, "dependencies": { - "@abp/codemirror": "^0.9.0", - "@abp/highlight.js": "^0.9.0", - "@abp/jquery": "^0.9.0", - "@abp/markdown-it": "^0.9.0", + "@abp/codemirror": "^0.9.2", + "@abp/highlight.js": "^0.9.2", + "@abp/jquery": "^0.9.2", + "@abp/markdown-it": "^0.9.2", "tui-editor": "^1.2.6" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" From 6f0ecace582eb1844fd915938774516a2c2566a9 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 18 Oct 2019 16:19:11 +0800 Subject: [PATCH 71/96] Update project migration. --- .../20190918061142_Initial.Designer.cs | 1384 -------------- .../20191018081718_Initial.Designer.cs | 1696 +++++++++++++++++ ...2_Initial.cs => 20191018081718_Initial.cs} | 55 +- ...91018081734_Added_Book_Entity.Designer.cs} | 103 +- ...cs => 20191018081734_Added_Book_Entity.cs} | 15 - ...okStoreMigrationsDbContextModelSnapshot.cs | 101 +- .../20190816093449_Initial.Designer.cs | 1315 ------------- .../20191018081038_Initial.Designer.cs | 1610 ++++++++++++++++ ...9_Initial.cs => 20191018081038_Initial.cs} | 58 +- ...verHostMigrationsDbContextModelSnapshot.cs | 769 +++++--- .../20190603112909_Initial.Designer.cs | 1374 ------------- ...0603113122_Created_Book_Entity.Designer.cs | 1413 -------------- .../20190924133131_Upgraded_To_Abp_0_21.cs | 79 - .../20191018075950_Initial.Designer.cs | 1696 +++++++++++++++++ ...9_Initial.cs => 20191018075950_Initial.cs} | 69 +- ...018080014_Created_Book_Entity.Designer.cs} | 105 +- ... => 20191018080014_Created_Book_Entity.cs} | 0 ...okStoreMigrationsDbContextModelSnapshot.cs | 101 +- ....cs => 20191018081444_Initial.Designer.cs} | 4 +- ...9_Initial.cs => 20191018081444_Initial.cs} | 2 +- ...ardDemoMigrationsDbContextModelSnapshot.cs | 2 +- ....cs => 20191018081320_Initial.Designer.cs} | 4 +- ...5_Initial.cs => 20191018081320_Initial.cs} | 2 +- .../AuthServerDbContextModelSnapshot.cs | 2 +- ....cs => 20191018080830_Initial.Designer.cs} | 4 +- ...2_Initial.cs => 20191018080830_Initial.cs} | 2 +- ...ectNameMigrationsDbContextModelSnapshot.cs | 2 +- ....cs => 20191018080944_Initial.Designer.cs} | 4 +- ...0_Initial.cs => 20191018080944_Initial.cs} | 2 +- ...verHostMigrationsDbContextModelSnapshot.cs | 2 +- 30 files changed, 5861 insertions(+), 6114 deletions(-) delete mode 100644 samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.Designer.cs create mode 100644 samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.Designer.cs rename samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/{20190918061142_Initial.cs => 20191018081718_Initial.cs} (96%) rename samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/{20191008070344_Added_Book_Entity.Designer.cs => 20191018081734_Added_Book_Entity.Designer.cs} (96%) rename samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/{20191008070344_Added_Book_Entity.cs => 20191018081734_Added_Book_Entity.cs} (73%) delete mode 100644 samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.Designer.cs create mode 100644 samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.Designer.cs rename samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/{20190816093449_Initial.cs => 20191018081038_Initial.cs} (96%) delete mode 100644 samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.Designer.cs delete mode 100644 samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603113122_Created_Book_Entity.Designer.cs delete mode 100644 samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.cs create mode 100644 samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.Designer.cs rename samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/{20190603112909_Initial.cs => 20191018075950_Initial.cs} (95%) rename samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/{20190924133131_Upgraded_To_Abp_0_21.Designer.cs => 20191018080014_Created_Book_Entity.Designer.cs} (96%) rename samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/{20190603113122_Created_Book_Entity.cs => 20191018080014_Created_Book_Entity.cs} (100%) rename samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/{20191010023719_Initial.Designer.cs => 20191018081444_Initial.Designer.cs} (99%) rename samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/{20191010023719_Initial.cs => 20191018081444_Initial.cs} (99%) rename samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/{20191010024505_Initial.Designer.cs => 20191018081320_Initial.Designer.cs} (99%) rename samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/{20191010024505_Initial.cs => 20191018081320_Initial.cs} (99%) rename templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/{20191010024652_Initial.Designer.cs => 20191018080830_Initial.Designer.cs} (99%) rename templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/{20191010024652_Initial.cs => 20191018080830_Initial.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/{20191010024800_Initial.Designer.cs => 20191018080944_Initial.Designer.cs} (99%) rename templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/{20191010024800_Initial.cs => 20191018080944_Initial.cs} (99%) diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.Designer.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.Designer.cs deleted file mode 100644 index e8370037ab..0000000000 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.Designer.cs +++ /dev/null @@ -1,1384 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Acme.BookStore.EntityFrameworkCore; - -namespace Acme.BookStore.Migrations -{ - [DbContext(typeof(BookStoreMigrationsDbContext))] - [Migration("20190918061142_Initial")] - partial class Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ApplicationName") - .HasColumnName("ApplicationName") - .HasMaxLength(96); - - b.Property("BrowserInfo") - .HasColumnName("BrowserInfo") - .HasMaxLength(512); - - b.Property("ClientId") - .HasColumnName("ClientId") - .HasMaxLength(64); - - b.Property("ClientIpAddress") - .HasColumnName("ClientIpAddress") - .HasMaxLength(64); - - b.Property("ClientName") - .HasColumnName("ClientName") - .HasMaxLength(128); - - b.Property("Comments") - .HasColumnName("Comments") - .HasMaxLength(256); - - b.Property("ConcurrencyStamp"); - - b.Property("CorrelationId") - .HasColumnName("CorrelationId") - .HasMaxLength(64); - - b.Property("Exceptions") - .HasColumnName("Exceptions") - .HasMaxLength(4000); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("HttpMethod") - .HasColumnName("HttpMethod") - .HasMaxLength(16); - - b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); - - b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); - - b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TenantName"); - - b.Property("Url") - .HasColumnName("Url") - .HasMaxLength(256); - - b.Property("UserId") - .HasColumnName("UserId"); - - b.Property("UserName") - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("TenantId", "ExecutionTime"); - - b.HasIndex("TenantId", "UserId", "ExecutionTime"); - - b.ToTable("AbpAuditLogs"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("MethodName") - .HasColumnName("MethodName") - .HasMaxLength(128); - - b.Property("Parameters") - .HasColumnName("Parameters") - .HasMaxLength(2000); - - b.Property("ServiceName") - .HasColumnName("ServiceName") - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); - - b.ToTable("AbpAuditLogActions"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ChangeTime") - .HasColumnName("ChangeTime"); - - b.Property("ChangeType") - .HasColumnName("ChangeType"); - - b.Property("EntityId") - .IsRequired() - .HasColumnName("EntityId") - .HasMaxLength(128); - - b.Property("EntityTenantId"); - - b.Property("EntityTypeFullName") - .IsRequired() - .HasColumnName("EntityTypeFullName") - .HasMaxLength(128); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); - - b.ToTable("AbpEntityChanges"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("EntityChangeId"); - - b.Property("NewValue") - .HasColumnName("NewValue") - .HasMaxLength(512); - - b.Property("OriginalValue") - .HasColumnName("OriginalValue") - .HasMaxLength(512); - - b.Property("PropertyName") - .IsRequired() - .HasColumnName("PropertyName") - .HasMaxLength(128); - - b.Property("PropertyTypeFullName") - .IsRequired() - .HasColumnName("PropertyTypeFullName") - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("EntityChangeId"); - - b.ToTable("AbpEntityPropertyChanges"); - }); - - modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsAbandoned") - .ValueGeneratedOnAdd() - .HasDefaultValue(false); - - b.Property("JobArgs") - .IsRequired() - .HasMaxLength(1048576); - - b.Property("JobName") - .IsRequired() - .HasMaxLength(128); - - b.Property("LastTryTime"); - - b.Property("NextTryTime"); - - b.Property("Priority") - .ValueGeneratedOnAdd() - .HasDefaultValue((byte)15); - - b.Property("TryCount") - .ValueGeneratedOnAdd() - .HasDefaultValue((short)0); - - b.HasKey("Id"); - - b.HasIndex("IsAbandoned", "NextTryTime"); - - b.ToTable("AbpBackgroundJobs"); - }); - - modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpFeatureValues"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("Regex") - .HasMaxLength(512); - - b.Property("RegexDescription") - .HasMaxLength(128); - - b.Property("Required"); - - b.Property("ValueType"); - - b.HasKey("Id"); - - b.ToTable("AbpClaimTypes"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDefault") - .HasColumnName("IsDefault"); - - b.Property("IsPublic") - .HasColumnName("IsPublic"); - - b.Property("IsStatic") - .HasColumnName("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("NormalizedName") - .IsRequired() - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName"); - - b.ToTable("AbpRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AbpRoleClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount") - .ValueGeneratedOnAdd() - .HasColumnName("AccessFailedCount") - .HasDefaultValue(0); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Email") - .HasColumnName("Email") - .HasMaxLength(256); - - b.Property("EmailConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("EmailConfirmed") - .HasDefaultValue(false); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LockoutEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("LockoutEnabled") - .HasDefaultValue(false); - - b.Property("LockoutEnd"); - - b.Property("Name") - .HasColumnName("Name") - .HasMaxLength(64); - - b.Property("NormalizedEmail") - .HasColumnName("NormalizedEmail") - .HasMaxLength(256); - - b.Property("NormalizedUserName") - .IsRequired() - .HasColumnName("NormalizedUserName") - .HasMaxLength(256); - - b.Property("PasswordHash") - .HasColumnName("PasswordHash") - .HasMaxLength(256); - - b.Property("PhoneNumber") - .HasColumnName("PhoneNumber") - .HasMaxLength(16); - - b.Property("PhoneNumberConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("PhoneNumberConfirmed") - .HasDefaultValue(false); - - b.Property("SecurityStamp") - .IsRequired() - .HasColumnName("SecurityStamp") - .HasMaxLength(256); - - b.Property("Surname") - .HasColumnName("Surname") - .HasMaxLength(64); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TwoFactorEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("TwoFactorEnabled") - .HasDefaultValue(false); - - b.Property("UserName") - .IsRequired() - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("Email"); - - b.HasIndex("NormalizedEmail"); - - b.HasIndex("NormalizedUserName"); - - b.HasIndex("UserName"); - - b.ToTable("AbpUsers"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("TenantId"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AbpUserClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("ProviderDisplayName") - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(196); - - b.Property("TenantId"); - - b.HasKey("UserId", "LoginProvider"); - - b.HasIndex("LoginProvider", "ProviderKey"); - - b.ToTable("AbpUserLogins"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId", "UserId"); - - b.ToTable("AbpUserRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("Name") - .HasMaxLength(128); - - b.Property("TenantId"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AbpUserTokens"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.Property("Properties"); - - b.HasKey("Id"); - - b.ToTable("IdentityServerApiResources"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Type"); - - b.ToTable("IdentityServerApiClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("DisplayName") - .HasMaxLength(128); - - b.Property("Emphasize"); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("ApiResourceId", "Name"); - - b.ToTable("IdentityServerApiScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Name", "Type"); - - b.ToTable("IdentityServerApiScopeClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ApiResourceId", "Type", "Value"); - - b.ToTable("IdentityServerApiSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AbsoluteRefreshTokenLifetime"); - - b.Property("AccessTokenLifetime"); - - b.Property("AccessTokenType"); - - b.Property("AllowAccessTokensViaBrowser"); - - b.Property("AllowOfflineAccess"); - - b.Property("AllowPlainTextPkce"); - - b.Property("AllowRememberConsent"); - - b.Property("AlwaysIncludeUserClaimsInIdToken"); - - b.Property("AlwaysSendClientClaims"); - - b.Property("AuthorizationCodeLifetime"); - - b.Property("BackChannelLogoutSessionRequired"); - - b.Property("BackChannelLogoutUri") - .HasMaxLength(300); - - b.Property("ClientClaimsPrefix") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ClientName") - .HasMaxLength(200); - - b.Property("ClientUri") - .HasMaxLength(300); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("ConsentLifetime"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DeviceCodeLifetime"); - - b.Property("EnableLocalLogin"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("FrontChannelLogoutSessionRequired"); - - b.Property("FrontChannelLogoutUri") - .HasMaxLength(300); - - b.Property("IdentityTokenLifetime"); - - b.Property("IncludeJwtId"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LogoUri") - .HasMaxLength(300); - - b.Property("PairWiseSubjectSalt") - .HasMaxLength(200); - - b.Property("ProtocolType") - .IsRequired() - .HasMaxLength(200); - - b.Property("RefreshTokenExpiration"); - - b.Property("RefreshTokenUsage"); - - b.Property("RequireClientSecret"); - - b.Property("RequireConsent"); - - b.Property("RequirePkce"); - - b.Property("SlidingRefreshTokenLifetime"); - - b.Property("UpdateAccessTokenClaimsOnRefresh"); - - b.Property("UserCodeType") - .HasMaxLength(100); - - b.Property("UserSsoLifetime"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.ToTable("IdentityServerClients"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(250); - - b.Property("Value") - .HasMaxLength(250); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.Property("ClientId"); - - b.Property("Origin") - .HasMaxLength(150); - - b.HasKey("ClientId", "Origin"); - - b.ToTable("IdentityServerClientCorsOrigins"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.Property("ClientId"); - - b.Property("GrantType") - .HasMaxLength(196); - - b.HasKey("ClientId", "GrantType"); - - b.ToTable("IdentityServerClientGrantTypes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.Property("ClientId"); - - b.Property("Provider") - .HasMaxLength(64); - - b.HasKey("ClientId", "Provider"); - - b.ToTable("IdentityServerClientIdPRestrictions"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("PostLogoutRedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "PostLogoutRedirectUri"); - - b.ToTable("IdentityServerClientPostLogoutRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.Property("ClientId"); - - b.Property("Key") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("ClientId", "Key"); - - b.ToTable("IdentityServerClientProperties"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("RedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "RedirectUri"); - - b.ToTable("IdentityServerClientRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.Property("ClientId"); - - b.Property("Scope") - .HasMaxLength(196); - - b.HasKey("ClientId", "Scope"); - - b.ToTable("IdentityServerClientScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => - { - b.Property("Key") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime"); - - b.Property("Data") - .IsRequired(); - - b.Property("Expiration"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Id"); - - b.Property("SubjectId") - .HasMaxLength(200); - - b.Property("Type") - .IsRequired() - .HasMaxLength(50); - - b.HasKey("Key"); - - b.HasIndex("SubjectId", "ClientId", "Type"); - - b.ToTable("IdentityServerPersistedGrants"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.Property("IdentityResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("IdentityResourceId", "Type"); - - b.ToTable("IdentityServerIdentityClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Emphasize"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.Property("Properties"); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("Id"); - - b.ToTable("IdentityServerIdentityResources"); - }); - - modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(64); - - b.Property("ProviderName") - .IsRequired() - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpPermissionGrants"); - }); - - modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(2048); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpSettings"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(64); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("AbpTenants"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.Property("TenantId"); - - b.Property("Name") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(1024); - - b.HasKey("TenantId", "Name"); - - b.ToTable("AbpTenantConnectionStrings"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") - .WithMany("PropertyChanges") - .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany("Claims") - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Claims") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Logins") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Roles") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Tokens") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Scopes") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId", "Name") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Secrets") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Claims") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedCorsOrigins") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedGrantTypes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("IdentityProviderRestrictions") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("PostLogoutRedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Properties") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("RedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedScopes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("ClientSecrets") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource") - .WithMany("UserClaims") - .HasForeignKey("IdentityResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.HasOne("Volo.Abp.TenantManagement.Tenant") - .WithMany("ConnectionStrings") - .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.Designer.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.Designer.cs new file mode 100644 index 0000000000..58a98448a6 --- /dev/null +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.Designer.cs @@ -0,0 +1,1696 @@ +// +using System; +using Acme.BookStore.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace Acme.BookStore.Migrations +{ + [DbContext(typeof(BookStoreMigrationsDbContext))] + [Migration("20191018081718_Initial")] + partial class Initial + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationName") + .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") + .HasMaxLength(96); + + b.Property("BrowserInfo") + .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("ClientId") + .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientIpAddress") + .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientName") + .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Comments") + .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CorrelationId") + .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Exceptions") + .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("HttpMethod") + .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("HttpStatusCode") + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); + + b.Property("ImpersonatorTenantId") + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("ImpersonatorUserId") + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); + + b.Property("Url") + .HasColumnName("Url") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("UserId") + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserName") + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("MethodName") + .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Parameters") + .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ServiceName") + .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ChangeTime") + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); + + b.Property("ChangeType") + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); + + b.Property("EntityId") + .IsRequired() + .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); + + b.Property("NewValue") + .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("PropertyName") + .IsRequired() + .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsAbandoned") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("JobArgs") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(1048576); + + b.Property("JobName") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("LastTryTime") + .HasColumnType("datetime2"); + + b.Property("NextTryTime") + .HasColumnType("datetime2"); + + b.Property("Priority") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint") + .HasDefaultValue((byte)15); + + b.Property("TryCount") + .ValueGeneratedOnAdd() + .HasColumnType("smallint") + .HasDefaultValue((short)0); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs"); + }); + + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpFeatureValues"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Description") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Regex") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ValueType") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDefault") + .HasColumnName("IsDefault") + .HasColumnType("bit"); + + b.Property("IsPublic") + .HasColumnName("IsPublic") + .HasColumnType("bit"); + + b.Property("IsStatic") + .HasColumnName("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Email") + .HasColumnName("Email") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("Name") + .HasColumnName("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(196)") + .HasMaxLength(196); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Name") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerApiResources"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Type"); + + b.ToTable("IdentityServerApiClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("ApiResourceId", "Name"); + + b.ToTable("IdentityServerApiScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Name", "Type"); + + b.ToTable("IdentityServerApiScopeClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ApiResourceId", "Type", "Value"); + + b.ToTable("IdentityServerApiSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AbsoluteRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenType") + .HasColumnType("int"); + + b.Property("AllowAccessTokensViaBrowser") + .HasColumnType("bit"); + + b.Property("AllowOfflineAccess") + .HasColumnType("bit"); + + b.Property("AllowPlainTextPkce") + .HasColumnType("bit"); + + b.Property("AllowRememberConsent") + .HasColumnType("bit"); + + b.Property("AlwaysIncludeUserClaimsInIdToken") + .HasColumnType("bit"); + + b.Property("AlwaysSendClientClaims") + .HasColumnType("bit"); + + b.Property("AuthorizationCodeLifetime") + .HasColumnType("int"); + + b.Property("BackChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("BackChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ClientClaimsPrefix") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("ConsentLifetime") + .HasColumnType("int"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DeviceCodeLifetime") + .HasColumnType("int"); + + b.Property("EnableLocalLogin") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("FrontChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("FrontChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("IdentityTokenLifetime") + .HasColumnType("int"); + + b.Property("IncludeJwtId") + .HasColumnType("bit"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LogoUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("PairWiseSubjectSalt") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ProtocolType") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("RefreshTokenExpiration") + .HasColumnType("int"); + + b.Property("RefreshTokenUsage") + .HasColumnType("int"); + + b.Property("RequireClientSecret") + .HasColumnType("bit"); + + b.Property("RequireConsent") + .HasColumnType("bit"); + + b.Property("RequirePkce") + .HasColumnType("bit"); + + b.Property("SlidingRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("UpdateAccessTokenClaimsOnRefresh") + .HasColumnType("bit"); + + b.Property("UserCodeType") + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); + + b.Property("UserSsoLifetime") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("IdentityServerClients"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Origin") + .HasColumnType("nvarchar(150)") + .HasMaxLength(150); + + b.HasKey("ClientId", "Origin"); + + b.ToTable("IdentityServerClientCorsOrigins"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("GrantType") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "GrantType"); + + b.ToTable("IdentityServerClientGrantTypes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Provider") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Provider"); + + b.ToTable("IdentityServerClientIdPRestrictions"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("PostLogoutRedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "PostLogoutRedirectUri"); + + b.ToTable("IdentityServerClientPostLogoutRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Key") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "Key"); + + b.ToTable("IdentityServerClientProperties"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("RedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "RedirectUri"); + + b.ToTable("IdentityServerClientRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Scope") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Scope"); + + b.ToTable("IdentityServerClientScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => + { + b.Property("Key") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("SubjectId") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .IsRequired() + .HasColumnType("nvarchar(50)") + .HasMaxLength(50); + + b.HasKey("Key"); + + b.HasIndex("Expiration"); + + b.HasIndex("SubjectId", "ClientId", "Type"); + + b.ToTable("IdentityServerPersistedGrants"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.Property("IdentityResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("IdentityResourceId", "Type"); + + b.ToTable("IdentityServerIdentityClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerIdentityResources"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2048)") + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Scopes") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId", "Name") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Secrets") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Claims") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedCorsOrigins") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedGrantTypes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("IdentityProviderRestrictions") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("PostLogoutRedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Properties") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("RedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedScopes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("ClientSecrets") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null) + .WithMany("UserClaims") + .HasForeignKey("IdentityResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.cs similarity index 96% rename from samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.cs rename to samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.cs index 9ed3c57eee..cc04cddbf2 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190918061142_Initial.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081718_Initial.cs @@ -243,8 +243,8 @@ namespace Acme.BookStore.Migrations ClientId = table.Column(maxLength: 200, nullable: false), ClientName = table.Column(maxLength: 200, nullable: true), Description = table.Column(maxLength: 1000, nullable: true), - ClientUri = table.Column(maxLength: 300, nullable: true), - LogoUri = table.Column(maxLength: 300, nullable: true), + ClientUri = table.Column(maxLength: 2000, nullable: true), + LogoUri = table.Column(maxLength: 2000, nullable: true), Enabled = table.Column(nullable: false), ProtocolType = table.Column(maxLength: 200, nullable: false), RequireClientSecret = table.Column(nullable: false), @@ -254,9 +254,9 @@ namespace Acme.BookStore.Migrations RequirePkce = table.Column(nullable: false), AllowPlainTextPkce = table.Column(nullable: false), AllowAccessTokensViaBrowser = table.Column(nullable: false), - FrontChannelLogoutUri = table.Column(maxLength: 300, nullable: true), + FrontChannelLogoutUri = table.Column(maxLength: 2000, nullable: true), FrontChannelLogoutSessionRequired = table.Column(nullable: false), - BackChannelLogoutUri = table.Column(maxLength: 300, nullable: true), + BackChannelLogoutUri = table.Column(maxLength: 2000, nullable: true), BackChannelLogoutSessionRequired = table.Column(nullable: false), AllowOfflineAccess = table.Column(nullable: false), IdentityTokenLifetime = table.Column(nullable: false), @@ -324,7 +324,7 @@ namespace Acme.BookStore.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { @@ -513,7 +513,7 @@ namespace Acme.BookStore.Migrations name: "IdentityServerApiClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), ApiResourceId = table.Column(nullable: false) }, constraints: table => @@ -532,9 +532,9 @@ namespace Acme.BookStore.Migrations columns: table => new { ApiResourceId = table.Column(nullable: false), - Name = table.Column(maxLength: 196, nullable: false), - DisplayName = table.Column(maxLength: 128, nullable: true), - Description = table.Column(maxLength: 256, nullable: true), + Name = table.Column(maxLength: 200, nullable: false), + DisplayName = table.Column(maxLength: 200, nullable: true), + Description = table.Column(maxLength: 1000, nullable: true), Required = table.Column(nullable: false), Emphasize = table.Column(nullable: false), ShowInDiscoveryDocument = table.Column(nullable: false) @@ -554,10 +554,10 @@ namespace Acme.BookStore.Migrations name: "IdentityServerApiSecrets", columns: table => new { - Type = table.Column(maxLength: 32, nullable: false), - Value = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 4000, nullable: false), ApiResourceId = table.Column(nullable: false), - Description = table.Column(maxLength: 256, nullable: true), + Description = table.Column(maxLength: 2000, nullable: true), Expiration = table.Column(nullable: true) }, constraints: table => @@ -613,7 +613,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - GrantType = table.Column(maxLength: 196, nullable: false) + GrantType = table.Column(maxLength: 250, nullable: false) }, constraints: table => { @@ -631,7 +631,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Provider = table.Column(maxLength: 64, nullable: false) + Provider = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -649,7 +649,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - PostLogoutRedirectUri = table.Column(maxLength: 200, nullable: false) + PostLogoutRedirectUri = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -667,8 +667,8 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Key = table.Column(maxLength: 64, nullable: false), - Value = table.Column(maxLength: 128, nullable: false) + Key = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -686,7 +686,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - RedirectUri = table.Column(maxLength: 200, nullable: false) + RedirectUri = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -704,7 +704,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Scope = table.Column(maxLength: 196, nullable: false) + Scope = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -721,10 +721,10 @@ namespace Acme.BookStore.Migrations name: "IdentityServerClientSecrets", columns: table => new { - Type = table.Column(maxLength: 32, nullable: false), - Value = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 4000, nullable: false), ClientId = table.Column(nullable: false), - Description = table.Column(maxLength: 256, nullable: true), + Description = table.Column(maxLength: 2000, nullable: true), Expiration = table.Column(nullable: true) }, constraints: table => @@ -742,7 +742,7 @@ namespace Acme.BookStore.Migrations name: "IdentityServerIdentityClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), IdentityResourceId = table.Column(nullable: false) }, constraints: table => @@ -783,9 +783,9 @@ namespace Acme.BookStore.Migrations name: "IdentityServerApiScopeClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), ApiResourceId = table.Column(nullable: false), - Name = table.Column(maxLength: 196, nullable: false) + Name = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -909,6 +909,11 @@ namespace Acme.BookStore.Migrations table: "IdentityServerClients", column: "ClientId"); + migrationBuilder.CreateIndex( + name: "IX_IdentityServerPersistedGrants_Expiration", + table: "IdentityServerPersistedGrants", + column: "Expiration"); + migrationBuilder.CreateIndex( name: "IX_IdentityServerPersistedGrants_SubjectId_ClientId_Type", table: "IdentityServerPersistedGrants", diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191008070344_Added_Book_Entity.Designer.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081734_Added_Book_Entity.Designer.cs similarity index 96% rename from samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191008070344_Added_Book_Entity.Designer.cs rename to samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081734_Added_Book_Entity.Designer.cs index 047d0450e6..105259f357 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191008070344_Added_Book_Entity.Designer.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081734_Added_Book_Entity.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Acme.BookStore.Migrations { [DbContext(typeof(BookStoreMigrationsDbContext))] - [Migration("20191008070344_Added_Book_Entity")] + [Migration("20191018081734_Added_Book_Entity")] partial class Added_Book_Entity { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -843,8 +843,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Type"); @@ -857,16 +857,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); b.Property("DisplayName") - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Emphasize") .HasColumnType("bit"); @@ -888,12 +888,12 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Name", "Type"); @@ -906,16 +906,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -965,8 +965,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("BackChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ClientClaimsPrefix") .HasColumnType("nvarchar(200)") @@ -982,8 +982,8 @@ namespace Acme.BookStore.Migrations .HasMaxLength(200); b.Property("ClientUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ConcurrencyStamp") .IsConcurrencyToken() @@ -1030,8 +1030,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("FrontChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("IdentityTokenLifetime") .HasColumnType("int"); @@ -1054,8 +1054,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("LogoUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("PairWiseSubjectSalt") .HasColumnType("nvarchar(200)") @@ -1139,8 +1139,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("GrantType") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.HasKey("ClientId", "GrantType"); @@ -1153,8 +1153,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Provider") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Provider"); @@ -1167,8 +1167,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("PostLogoutRedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "PostLogoutRedirectUri"); @@ -1181,13 +1181,13 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Key") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") .IsRequired() - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "Key"); @@ -1200,8 +1200,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("RedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "RedirectUri"); @@ -1214,8 +1214,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Scope") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Scope"); @@ -1228,16 +1228,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1266,7 +1266,8 @@ namespace Acme.BookStore.Migrations b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)"); + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1289,6 +1290,8 @@ namespace Acme.BookStore.Migrations b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); b.ToTable("IdentityServerPersistedGrants"); @@ -1300,8 +1303,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("IdentityResourceId", "Type"); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191008070344_Added_Book_Entity.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081734_Added_Book_Entity.cs similarity index 73% rename from samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191008070344_Added_Book_Entity.cs rename to samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081734_Added_Book_Entity.cs index 2e2b02894c..c36a18416a 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191008070344_Added_Book_Entity.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018081734_Added_Book_Entity.cs @@ -7,14 +7,6 @@ namespace Acme.BookStore.Migrations { protected override void Up(MigrationBuilder migrationBuilder) { - migrationBuilder.AlterColumn( - name: "Data", - table: "IdentityServerPersistedGrants", - nullable: false, - oldClrType: typeof(string), - oldType: "nvarchar(max)", - oldNullable: true); - migrationBuilder.CreateTable( name: "BmBooks", columns: table => new @@ -41,13 +33,6 @@ namespace Acme.BookStore.Migrations { migrationBuilder.DropTable( name: "BmBooks"); - - migrationBuilder.AlterColumn( - name: "Data", - table: "IdentityServerPersistedGrants", - type: "nvarchar(max)", - nullable: true, - oldClrType: typeof(string)); } } } diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs index b2fc04c12b..0577f0d399 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs @@ -841,8 +841,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Type"); @@ -855,16 +855,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); b.Property("DisplayName") - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Emphasize") .HasColumnType("bit"); @@ -886,12 +886,12 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Name", "Type"); @@ -904,16 +904,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -963,8 +963,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("BackChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ClientClaimsPrefix") .HasColumnType("nvarchar(200)") @@ -980,8 +980,8 @@ namespace Acme.BookStore.Migrations .HasMaxLength(200); b.Property("ClientUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ConcurrencyStamp") .IsConcurrencyToken() @@ -1028,8 +1028,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("FrontChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("IdentityTokenLifetime") .HasColumnType("int"); @@ -1052,8 +1052,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("LogoUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("PairWiseSubjectSalt") .HasColumnType("nvarchar(200)") @@ -1137,8 +1137,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("GrantType") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.HasKey("ClientId", "GrantType"); @@ -1151,8 +1151,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Provider") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Provider"); @@ -1165,8 +1165,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("PostLogoutRedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "PostLogoutRedirectUri"); @@ -1179,13 +1179,13 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Key") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") .IsRequired() - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "Key"); @@ -1198,8 +1198,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("RedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "RedirectUri"); @@ -1212,8 +1212,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Scope") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Scope"); @@ -1226,16 +1226,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1264,7 +1264,8 @@ namespace Acme.BookStore.Migrations b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)"); + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1287,6 +1288,8 @@ namespace Acme.BookStore.Migrations b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); b.ToTable("IdentityServerPersistedGrants"); @@ -1298,8 +1301,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("IdentityResourceId", "Type"); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.Designer.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.Designer.cs deleted file mode 100644 index 4feee02096..0000000000 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.Designer.cs +++ /dev/null @@ -1,1315 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Acme.BookStore.BookManagement.EntityFrameworkCore; - -namespace Acme.BookStore.BookManagement.Migrations -{ - [DbContext(typeof(IdentityServerHostMigrationsDbContext))] - [Migration("20190816093449_Initial")] - partial class Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ApplicationName") - .HasColumnName("ApplicationName") - .HasMaxLength(96); - - b.Property("BrowserInfo") - .HasColumnName("BrowserInfo") - .HasMaxLength(512); - - b.Property("ClientId") - .HasColumnName("ClientId") - .HasMaxLength(64); - - b.Property("ClientIpAddress") - .HasColumnName("ClientIpAddress") - .HasMaxLength(64); - - b.Property("ClientName") - .HasColumnName("ClientName") - .HasMaxLength(128); - - b.Property("Comments") - .HasColumnName("Comments") - .HasMaxLength(256); - - b.Property("ConcurrencyStamp"); - - b.Property("CorrelationId") - .HasColumnName("CorrelationId") - .HasMaxLength(64); - - b.Property("Exceptions") - .HasColumnName("Exceptions") - .HasMaxLength(4000); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("HttpMethod") - .HasColumnName("HttpMethod") - .HasMaxLength(16); - - b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); - - b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); - - b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TenantName"); - - b.Property("Url") - .HasColumnName("Url") - .HasMaxLength(256); - - b.Property("UserId") - .HasColumnName("UserId"); - - b.Property("UserName") - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("TenantId", "ExecutionTime"); - - b.HasIndex("TenantId", "UserId", "ExecutionTime"); - - b.ToTable("AbpAuditLogs"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("MethodName") - .HasColumnName("MethodName") - .HasMaxLength(128); - - b.Property("Parameters") - .HasColumnName("Parameters") - .HasMaxLength(2000); - - b.Property("ServiceName") - .HasColumnName("ServiceName") - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); - - b.ToTable("AbpAuditLogActions"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ChangeTime") - .HasColumnName("ChangeTime"); - - b.Property("ChangeType") - .HasColumnName("ChangeType"); - - b.Property("EntityId") - .IsRequired() - .HasColumnName("EntityId") - .HasMaxLength(128); - - b.Property("EntityTenantId"); - - b.Property("EntityTypeFullName") - .IsRequired() - .HasColumnName("EntityTypeFullName") - .HasMaxLength(128); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); - - b.ToTable("AbpEntityChanges"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("EntityChangeId"); - - b.Property("NewValue") - .HasColumnName("NewValue") - .HasMaxLength(512); - - b.Property("OriginalValue") - .HasColumnName("OriginalValue") - .HasMaxLength(512); - - b.Property("PropertyName") - .IsRequired() - .HasColumnName("PropertyName") - .HasMaxLength(128); - - b.Property("PropertyTypeFullName") - .IsRequired() - .HasColumnName("PropertyTypeFullName") - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("EntityChangeId"); - - b.ToTable("AbpEntityPropertyChanges"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("Regex") - .HasMaxLength(512); - - b.Property("RegexDescription") - .HasMaxLength(128); - - b.Property("Required"); - - b.Property("ValueType"); - - b.HasKey("Id"); - - b.ToTable("AbpClaimTypes"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDefault") - .HasColumnName("IsDefault"); - - b.Property("IsPublic") - .HasColumnName("IsPublic"); - - b.Property("IsStatic") - .HasColumnName("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("NormalizedName") - .IsRequired() - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName"); - - b.ToTable("AbpRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AbpRoleClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount") - .ValueGeneratedOnAdd() - .HasColumnName("AccessFailedCount") - .HasDefaultValue(0); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Email") - .HasColumnName("Email") - .HasMaxLength(256); - - b.Property("EmailConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("EmailConfirmed") - .HasDefaultValue(false); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LockoutEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("LockoutEnabled") - .HasDefaultValue(false); - - b.Property("LockoutEnd"); - - b.Property("Name") - .HasColumnName("Name") - .HasMaxLength(64); - - b.Property("NormalizedEmail") - .HasColumnName("NormalizedEmail") - .HasMaxLength(256); - - b.Property("NormalizedUserName") - .IsRequired() - .HasColumnName("NormalizedUserName") - .HasMaxLength(256); - - b.Property("PasswordHash") - .HasColumnName("PasswordHash") - .HasMaxLength(256); - - b.Property("PhoneNumber") - .HasColumnName("PhoneNumber") - .HasMaxLength(16); - - b.Property("PhoneNumberConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("PhoneNumberConfirmed") - .HasDefaultValue(false); - - b.Property("SecurityStamp") - .IsRequired() - .HasColumnName("SecurityStamp") - .HasMaxLength(256); - - b.Property("Surname") - .HasColumnName("Surname") - .HasMaxLength(64); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TwoFactorEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("TwoFactorEnabled") - .HasDefaultValue(false); - - b.Property("UserName") - .IsRequired() - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("Email"); - - b.HasIndex("NormalizedEmail"); - - b.HasIndex("NormalizedUserName"); - - b.HasIndex("UserName"); - - b.ToTable("AbpUsers"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("TenantId"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AbpUserClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("ProviderDisplayName") - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(196); - - b.Property("TenantId"); - - b.HasKey("UserId", "LoginProvider"); - - b.HasIndex("LoginProvider", "ProviderKey"); - - b.ToTable("AbpUserLogins"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId", "UserId"); - - b.ToTable("AbpUserRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("Name") - .HasMaxLength(128); - - b.Property("TenantId"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AbpUserTokens"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.Property("Properties"); - - b.HasKey("Id"); - - b.ToTable("IdentityServerApiResources"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Type"); - - b.ToTable("IdentityServerApiClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("DisplayName") - .HasMaxLength(128); - - b.Property("Emphasize"); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("ApiResourceId", "Name"); - - b.ToTable("IdentityServerApiScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Name", "Type"); - - b.ToTable("IdentityServerApiScopeClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ApiResourceId", "Type", "Value"); - - b.ToTable("IdentityServerApiSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AbsoluteRefreshTokenLifetime"); - - b.Property("AccessTokenLifetime"); - - b.Property("AccessTokenType"); - - b.Property("AllowAccessTokensViaBrowser"); - - b.Property("AllowOfflineAccess"); - - b.Property("AllowPlainTextPkce"); - - b.Property("AllowRememberConsent"); - - b.Property("AlwaysIncludeUserClaimsInIdToken"); - - b.Property("AlwaysSendClientClaims"); - - b.Property("AuthorizationCodeLifetime"); - - b.Property("BackChannelLogoutSessionRequired"); - - b.Property("BackChannelLogoutUri") - .HasMaxLength(300); - - b.Property("ClientClaimsPrefix") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ClientName") - .HasMaxLength(200); - - b.Property("ClientUri") - .HasMaxLength(300); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("ConsentLifetime"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DeviceCodeLifetime"); - - b.Property("EnableLocalLogin"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("FrontChannelLogoutSessionRequired"); - - b.Property("FrontChannelLogoutUri") - .HasMaxLength(300); - - b.Property("IdentityTokenLifetime"); - - b.Property("IncludeJwtId"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LogoUri") - .HasMaxLength(300); - - b.Property("PairWiseSubjectSalt") - .HasMaxLength(200); - - b.Property("ProtocolType") - .IsRequired() - .HasMaxLength(200); - - b.Property("RefreshTokenExpiration"); - - b.Property("RefreshTokenUsage"); - - b.Property("RequireClientSecret"); - - b.Property("RequireConsent"); - - b.Property("RequirePkce"); - - b.Property("SlidingRefreshTokenLifetime"); - - b.Property("UpdateAccessTokenClaimsOnRefresh"); - - b.Property("UserCodeType") - .HasMaxLength(100); - - b.Property("UserSsoLifetime"); - - b.HasKey("Id"); - - b.HasIndex("ClientId") - .IsUnique(); - - b.ToTable("IdentityServerClients"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(250); - - b.Property("Value") - .HasMaxLength(250); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.Property("ClientId"); - - b.Property("Origin") - .HasMaxLength(150); - - b.HasKey("ClientId", "Origin"); - - b.ToTable("IdentityServerClientCorsOrigins"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.Property("ClientId"); - - b.Property("GrantType") - .HasMaxLength(196); - - b.HasKey("ClientId", "GrantType"); - - b.ToTable("IdentityServerClientGrantTypes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.Property("ClientId"); - - b.Property("Provider") - .HasMaxLength(64); - - b.HasKey("ClientId", "Provider"); - - b.ToTable("IdentityServerClientIdPRestrictions"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("PostLogoutRedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "PostLogoutRedirectUri"); - - b.ToTable("IdentityServerClientPostLogoutRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.Property("ClientId"); - - b.Property("Key") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("ClientId", "Key"); - - b.ToTable("IdentityServerClientProperties"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("RedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "RedirectUri"); - - b.ToTable("IdentityServerClientRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.Property("ClientId"); - - b.Property("Scope") - .HasMaxLength(196); - - b.HasKey("ClientId", "Scope"); - - b.ToTable("IdentityServerClientScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => - { - b.Property("Key") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime"); - - b.Property("Data") - .IsRequired(); - - b.Property("Expiration"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Id"); - - b.Property("SubjectId") - .HasMaxLength(200); - - b.Property("Type") - .IsRequired() - .HasMaxLength(50); - - b.HasKey("Key"); - - b.HasIndex("SubjectId", "ClientId", "Type"); - - b.ToTable("IdentityServerPersistedGrants"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.Property("IdentityResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("IdentityResourceId", "Type"); - - b.ToTable("IdentityServerIdentityClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Emphasize"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.Property("Properties"); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("Id"); - - b.ToTable("IdentityServerIdentityResources"); - }); - - modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(64); - - b.Property("ProviderName") - .IsRequired() - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpPermissionGrants"); - }); - - modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(2048); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpSettings"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(64); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("AbpTenants"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.Property("TenantId"); - - b.Property("Name") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(1024); - - b.HasKey("TenantId", "Name"); - - b.ToTable("AbpTenantConnectionStrings"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") - .WithMany("PropertyChanges") - .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany("Claims") - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Claims") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Logins") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Roles") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Tokens") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Scopes") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId", "Name") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Secrets") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Claims") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedCorsOrigins") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedGrantTypes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("IdentityProviderRestrictions") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("PostLogoutRedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Properties") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("RedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedScopes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("ClientSecrets") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource") - .WithMany("UserClaims") - .HasForeignKey("IdentityResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.HasOne("Volo.Abp.TenantManagement.Tenant") - .WithMany("ConnectionStrings") - .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.Designer.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.Designer.cs new file mode 100644 index 0000000000..0e8868dd77 --- /dev/null +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.Designer.cs @@ -0,0 +1,1610 @@ +// +using System; +using Acme.BookStore.BookManagement.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace Acme.BookStore.BookManagement.Migrations +{ + [DbContext(typeof(IdentityServerHostMigrationsDbContext))] + [Migration("20191018081038_Initial")] + partial class Initial + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationName") + .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") + .HasMaxLength(96); + + b.Property("BrowserInfo") + .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("ClientId") + .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientIpAddress") + .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientName") + .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Comments") + .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CorrelationId") + .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Exceptions") + .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("HttpMethod") + .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("HttpStatusCode") + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); + + b.Property("ImpersonatorTenantId") + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("ImpersonatorUserId") + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); + + b.Property("Url") + .HasColumnName("Url") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("UserId") + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserName") + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("MethodName") + .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Parameters") + .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ServiceName") + .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ChangeTime") + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); + + b.Property("ChangeType") + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); + + b.Property("EntityId") + .IsRequired() + .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); + + b.Property("NewValue") + .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("PropertyName") + .IsRequired() + .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Description") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Regex") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ValueType") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDefault") + .HasColumnName("IsDefault") + .HasColumnType("bit"); + + b.Property("IsPublic") + .HasColumnName("IsPublic") + .HasColumnType("bit"); + + b.Property("IsStatic") + .HasColumnName("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Email") + .HasColumnName("Email") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("Name") + .HasColumnName("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(196)") + .HasMaxLength(196); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Name") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerApiResources"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Type"); + + b.ToTable("IdentityServerApiClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("ApiResourceId", "Name"); + + b.ToTable("IdentityServerApiScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Name", "Type"); + + b.ToTable("IdentityServerApiScopeClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ApiResourceId", "Type", "Value"); + + b.ToTable("IdentityServerApiSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AbsoluteRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenType") + .HasColumnType("int"); + + b.Property("AllowAccessTokensViaBrowser") + .HasColumnType("bit"); + + b.Property("AllowOfflineAccess") + .HasColumnType("bit"); + + b.Property("AllowPlainTextPkce") + .HasColumnType("bit"); + + b.Property("AllowRememberConsent") + .HasColumnType("bit"); + + b.Property("AlwaysIncludeUserClaimsInIdToken") + .HasColumnType("bit"); + + b.Property("AlwaysSendClientClaims") + .HasColumnType("bit"); + + b.Property("AuthorizationCodeLifetime") + .HasColumnType("int"); + + b.Property("BackChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("BackChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ClientClaimsPrefix") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("ConsentLifetime") + .HasColumnType("int"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DeviceCodeLifetime") + .HasColumnType("int"); + + b.Property("EnableLocalLogin") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("FrontChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("FrontChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("IdentityTokenLifetime") + .HasColumnType("int"); + + b.Property("IncludeJwtId") + .HasColumnType("bit"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LogoUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("PairWiseSubjectSalt") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ProtocolType") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("RefreshTokenExpiration") + .HasColumnType("int"); + + b.Property("RefreshTokenUsage") + .HasColumnType("int"); + + b.Property("RequireClientSecret") + .HasColumnType("bit"); + + b.Property("RequireConsent") + .HasColumnType("bit"); + + b.Property("RequirePkce") + .HasColumnType("bit"); + + b.Property("SlidingRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("UpdateAccessTokenClaimsOnRefresh") + .HasColumnType("bit"); + + b.Property("UserCodeType") + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); + + b.Property("UserSsoLifetime") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("IdentityServerClients"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Origin") + .HasColumnType("nvarchar(150)") + .HasMaxLength(150); + + b.HasKey("ClientId", "Origin"); + + b.ToTable("IdentityServerClientCorsOrigins"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("GrantType") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "GrantType"); + + b.ToTable("IdentityServerClientGrantTypes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Provider") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Provider"); + + b.ToTable("IdentityServerClientIdPRestrictions"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("PostLogoutRedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "PostLogoutRedirectUri"); + + b.ToTable("IdentityServerClientPostLogoutRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Key") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "Key"); + + b.ToTable("IdentityServerClientProperties"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("RedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "RedirectUri"); + + b.ToTable("IdentityServerClientRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Scope") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Scope"); + + b.ToTable("IdentityServerClientScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => + { + b.Property("Key") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("SubjectId") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .IsRequired() + .HasColumnType("nvarchar(50)") + .HasMaxLength(50); + + b.HasKey("Key"); + + b.HasIndex("Expiration"); + + b.HasIndex("SubjectId", "ClientId", "Type"); + + b.ToTable("IdentityServerPersistedGrants"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.Property("IdentityResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("IdentityResourceId", "Type"); + + b.ToTable("IdentityServerIdentityClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerIdentityResources"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2048)") + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Scopes") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId", "Name") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Secrets") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Claims") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedCorsOrigins") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedGrantTypes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("IdentityProviderRestrictions") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("PostLogoutRedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Properties") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("RedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedScopes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("ClientSecrets") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null) + .WithMany("UserClaims") + .HasForeignKey("IdentityResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.cs similarity index 96% rename from samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.cs rename to samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.cs index e98475c79d..5fea609471 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20190816093449_Initial.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/20191018081038_Initial.cs @@ -207,8 +207,8 @@ namespace Acme.BookStore.BookManagement.Migrations ClientId = table.Column(maxLength: 200, nullable: false), ClientName = table.Column(maxLength: 200, nullable: true), Description = table.Column(maxLength: 1000, nullable: true), - ClientUri = table.Column(maxLength: 300, nullable: true), - LogoUri = table.Column(maxLength: 300, nullable: true), + ClientUri = table.Column(maxLength: 2000, nullable: true), + LogoUri = table.Column(maxLength: 2000, nullable: true), Enabled = table.Column(nullable: false), ProtocolType = table.Column(maxLength: 200, nullable: false), RequireClientSecret = table.Column(nullable: false), @@ -218,9 +218,9 @@ namespace Acme.BookStore.BookManagement.Migrations RequirePkce = table.Column(nullable: false), AllowPlainTextPkce = table.Column(nullable: false), AllowAccessTokensViaBrowser = table.Column(nullable: false), - FrontChannelLogoutUri = table.Column(maxLength: 300, nullable: true), + FrontChannelLogoutUri = table.Column(maxLength: 2000, nullable: true), FrontChannelLogoutSessionRequired = table.Column(nullable: false), - BackChannelLogoutUri = table.Column(maxLength: 300, nullable: true), + BackChannelLogoutUri = table.Column(maxLength: 2000, nullable: true), BackChannelLogoutSessionRequired = table.Column(nullable: false), AllowOfflineAccess = table.Column(nullable: false), IdentityTokenLifetime = table.Column(nullable: false), @@ -288,7 +288,7 @@ namespace Acme.BookStore.BookManagement.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { @@ -477,7 +477,7 @@ namespace Acme.BookStore.BookManagement.Migrations name: "IdentityServerApiClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), ApiResourceId = table.Column(nullable: false) }, constraints: table => @@ -496,9 +496,9 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ApiResourceId = table.Column(nullable: false), - Name = table.Column(maxLength: 196, nullable: false), - DisplayName = table.Column(maxLength: 128, nullable: true), - Description = table.Column(maxLength: 256, nullable: true), + Name = table.Column(maxLength: 200, nullable: false), + DisplayName = table.Column(maxLength: 200, nullable: true), + Description = table.Column(maxLength: 1000, nullable: true), Required = table.Column(nullable: false), Emphasize = table.Column(nullable: false), ShowInDiscoveryDocument = table.Column(nullable: false) @@ -518,10 +518,10 @@ namespace Acme.BookStore.BookManagement.Migrations name: "IdentityServerApiSecrets", columns: table => new { - Type = table.Column(maxLength: 32, nullable: false), - Value = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 4000, nullable: false), ApiResourceId = table.Column(nullable: false), - Description = table.Column(maxLength: 256, nullable: true), + Description = table.Column(maxLength: 2000, nullable: true), Expiration = table.Column(nullable: true) }, constraints: table => @@ -577,7 +577,7 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ClientId = table.Column(nullable: false), - GrantType = table.Column(maxLength: 196, nullable: false) + GrantType = table.Column(maxLength: 250, nullable: false) }, constraints: table => { @@ -595,7 +595,7 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Provider = table.Column(maxLength: 64, nullable: false) + Provider = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -613,7 +613,7 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ClientId = table.Column(nullable: false), - PostLogoutRedirectUri = table.Column(maxLength: 200, nullable: false) + PostLogoutRedirectUri = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -631,8 +631,8 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Key = table.Column(maxLength: 64, nullable: false), - Value = table.Column(maxLength: 128, nullable: false) + Key = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -650,7 +650,7 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ClientId = table.Column(nullable: false), - RedirectUri = table.Column(maxLength: 200, nullable: false) + RedirectUri = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -668,7 +668,7 @@ namespace Acme.BookStore.BookManagement.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Scope = table.Column(maxLength: 196, nullable: false) + Scope = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -685,10 +685,10 @@ namespace Acme.BookStore.BookManagement.Migrations name: "IdentityServerClientSecrets", columns: table => new { - Type = table.Column(maxLength: 32, nullable: false), - Value = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 4000, nullable: false), ClientId = table.Column(nullable: false), - Description = table.Column(maxLength: 256, nullable: true), + Description = table.Column(maxLength: 2000, nullable: true), Expiration = table.Column(nullable: true) }, constraints: table => @@ -706,7 +706,7 @@ namespace Acme.BookStore.BookManagement.Migrations name: "IdentityServerIdentityClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), IdentityResourceId = table.Column(nullable: false) }, constraints: table => @@ -747,9 +747,9 @@ namespace Acme.BookStore.BookManagement.Migrations name: "IdentityServerApiScopeClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), ApiResourceId = table.Column(nullable: false), - Name = table.Column(maxLength: 196, nullable: false) + Name = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -861,8 +861,12 @@ namespace Acme.BookStore.BookManagement.Migrations migrationBuilder.CreateIndex( name: "IX_IdentityServerClients_ClientId", table: "IdentityServerClients", - column: "ClientId", - unique: true); + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_IdentityServerPersistedGrants_Expiration", + table: "IdentityServerPersistedGrants", + column: "Expiration"); migrationBuilder.CreateIndex( name: "IX_IdentityServerPersistedGrants_SubjectId_ClientId_Type", diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs index d5d642c5a5..6dceb1571b 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs @@ -1,10 +1,10 @@ // using System; +using Acme.BookStore.BookManagement.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using Acme.BookStore.BookManagement.EntityFrameworkCore; namespace Acme.BookStore.BookManagement.Migrations { @@ -15,84 +15,106 @@ namespace Acme.BookStore.BookManagement.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") + .HasAnnotation("ProductVersion", "3.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ApplicationName") .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") .HasMaxLength(96); b.Property("BrowserInfo") .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("ClientId") .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ClientIpAddress") .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ClientName") .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("Comments") .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("ConcurrencyStamp"); + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CorrelationId") .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Exceptions") .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") .HasMaxLength(4000); b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); - b.Property("ExecutionTime"); + b.Property("ExecutionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("HttpMethod") .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") .HasMaxLength(16); b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantName"); + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); b.Property("Url") .HasColumnName("Url") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("UserId") - .HasColumnName("UserId"); + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); b.Property("UserName") .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.HasKey("Id"); @@ -107,33 +129,42 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AuditLogId") - .HasColumnName("AuditLogId"); + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("MethodName") .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("Parameters") .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") .HasMaxLength(2000); b.Property("ServiceName") .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -147,34 +178,43 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AuditLogId") - .HasColumnName("AuditLogId"); + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); b.Property("ChangeTime") - .HasColumnName("ChangeTime"); + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); b.Property("ChangeType") - .HasColumnName("ChangeType"); + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); b.Property("EntityId") .IsRequired() .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("EntityTenantId"); + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); b.Property("EntityTypeFullName") .IsRequired() .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -188,29 +228,36 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); - b.Property("EntityChangeId"); + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); b.Property("NewValue") .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("OriginalValue") .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("PropertyName") .IsRequired() .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("PropertyTypeFullName") .IsRequired() .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -222,35 +269,45 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Description") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); - b.Property("IsStatic"); + b.Property("IsStatic") + .HasColumnType("bit"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Regex") + .HasColumnType("nvarchar(512)") .HasMaxLength(512); b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("Required"); + b.Property("Required") + .HasColumnType("bit"); - b.Property("ValueType"); + b.Property("ValueType") + .HasColumnType("int"); b.HasKey("Id"); @@ -260,35 +317,44 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() .IsRequired() .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDefault") - .HasColumnName("IsDefault"); + .HasColumnName("IsDefault") + .HasColumnType("bit"); b.Property("IsPublic") - .HasColumnName("IsPublic"); + .HasColumnName("IsPublic") + .HasColumnType("bit"); b.Property("IsStatic") - .HasColumnName("IsStatic"); + .HasColumnName("IsStatic") + .HasColumnType("bit"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("NormalizedName") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -300,18 +366,22 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .HasColumnType("uniqueidentifier"); b.Property("ClaimType") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); - b.Property("RoleId"); + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -323,105 +393,131 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("AccessFailedCount") .ValueGeneratedOnAdd() .HasColumnName("AccessFailedCount") + .HasColumnType("int") .HasDefaultValue(0); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("Email") .HasColumnName("Email") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("EmailConfirmed") .ValueGeneratedOnAdd() .HasColumnName("EmailConfirmed") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("LockoutEnabled") .ValueGeneratedOnAdd() .HasColumnName("LockoutEnabled") + .HasColumnType("bit") .HasDefaultValue(false); - b.Property("LockoutEnd"); + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); b.Property("Name") .HasColumnName("Name") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("NormalizedEmail") .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("NormalizedUserName") .IsRequired() .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("PasswordHash") .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("PhoneNumber") .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") .HasMaxLength(16); b.Property("PhoneNumberConfirmed") .ValueGeneratedOnAdd() .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("SecurityStamp") .IsRequired() .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("Surname") .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("TenantId") - .HasColumnName("TenantId"); + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); b.Property("TwoFactorEnabled") .ValueGeneratedOnAdd() .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("UserName") .IsRequired() .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.HasKey("Id"); @@ -440,18 +536,22 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .HasColumnType("uniqueidentifier"); b.Property("ClaimType") .IsRequired() + .HasColumnType("nvarchar(256)") .HasMaxLength(256); b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -462,19 +562,24 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") .IsRequired() + .HasColumnType("nvarchar(196)") .HasMaxLength(196); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("UserId", "LoginProvider"); @@ -485,11 +590,14 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); - b.Property("RoleId"); + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("UserId", "RoleId"); @@ -500,17 +608,22 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => { - b.Property("UserId"); + b.Property("UserId") + .HasColumnType("uniqueidentifier"); b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Name") + .HasColumnType("nvarchar(128)") .HasMaxLength(128); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); - b.Property("Value"); + b.Property("Value") + .HasColumnType("nvarchar(max)"); b.HasKey("UserId", "LoginProvider", "Name"); @@ -520,51 +633,66 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("Description") + .HasColumnType("nvarchar(1000)") .HasMaxLength(1000); b.Property("DisplayName") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); - b.Property("Enabled"); + b.Property("Enabled") + .HasColumnType("bit"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(200)") .HasMaxLength(200); - b.Property("Properties"); + b.Property("Properties") + .HasColumnType("nvarchar(max)"); b.HasKey("Id"); @@ -573,10 +701,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => { - b.Property("ApiResourceId"); + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Type"); @@ -585,22 +715,29 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => { - b.Property("ApiResourceId"); + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Description") - .HasMaxLength(256); + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); b.Property("DisplayName") - .HasMaxLength(128); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); - b.Property("Emphasize"); + b.Property("Emphasize") + .HasColumnType("bit"); - b.Property("Required"); + b.Property("Required") + .HasColumnType("bit"); - b.Property("ShowInDiscoveryDocument"); + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); b.HasKey("ApiResourceId", "Name"); @@ -609,13 +746,16 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => { - b.Property("ApiResourceId"); + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Type") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Name", "Type"); @@ -624,18 +764,23 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => { - b.Property("ApiResourceId"); + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); - b.Property("Expiration"); + b.Property("Expiration") + .HasColumnType("datetime2"); b.HasKey("ApiResourceId", "Type", "Value"); @@ -645,141 +790,190 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); - b.Property("AbsoluteRefreshTokenLifetime"); + b.Property("AbsoluteRefreshTokenLifetime") + .HasColumnType("int"); - b.Property("AccessTokenLifetime"); + b.Property("AccessTokenLifetime") + .HasColumnType("int"); - b.Property("AccessTokenType"); + b.Property("AccessTokenType") + .HasColumnType("int"); - b.Property("AllowAccessTokensViaBrowser"); + b.Property("AllowAccessTokensViaBrowser") + .HasColumnType("bit"); - b.Property("AllowOfflineAccess"); + b.Property("AllowOfflineAccess") + .HasColumnType("bit"); - b.Property("AllowPlainTextPkce"); + b.Property("AllowPlainTextPkce") + .HasColumnType("bit"); - b.Property("AllowRememberConsent"); + b.Property("AllowRememberConsent") + .HasColumnType("bit"); - b.Property("AlwaysIncludeUserClaimsInIdToken"); + b.Property("AlwaysIncludeUserClaimsInIdToken") + .HasColumnType("bit"); - b.Property("AlwaysSendClientClaims"); + b.Property("AlwaysSendClientClaims") + .HasColumnType("bit"); - b.Property("AuthorizationCodeLifetime"); + b.Property("AuthorizationCodeLifetime") + .HasColumnType("int"); - b.Property("BackChannelLogoutSessionRequired"); + b.Property("BackChannelLogoutSessionRequired") + .HasColumnType("bit"); b.Property("BackChannelLogoutUri") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ClientClaimsPrefix") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); b.Property("ClientId") .IsRequired() + .HasColumnType("nvarchar(200)") .HasMaxLength(200); b.Property("ClientName") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); b.Property("ClientUri") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); - b.Property("ConsentLifetime"); + b.Property("ConsentLifetime") + .HasColumnType("int"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("Description") + .HasColumnType("nvarchar(1000)") .HasMaxLength(1000); - b.Property("DeviceCodeLifetime"); + b.Property("DeviceCodeLifetime") + .HasColumnType("int"); - b.Property("EnableLocalLogin"); + b.Property("EnableLocalLogin") + .HasColumnType("bit"); - b.Property("Enabled"); + b.Property("Enabled") + .HasColumnType("bit"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); - b.Property("FrontChannelLogoutSessionRequired"); + b.Property("FrontChannelLogoutSessionRequired") + .HasColumnType("bit"); b.Property("FrontChannelLogoutUri") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); - b.Property("IdentityTokenLifetime"); + b.Property("IdentityTokenLifetime") + .HasColumnType("int"); - b.Property("IncludeJwtId"); + b.Property("IncludeJwtId") + .HasColumnType("bit"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("LogoUri") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("PairWiseSubjectSalt") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); b.Property("ProtocolType") .IsRequired() + .HasColumnType("nvarchar(200)") .HasMaxLength(200); - b.Property("RefreshTokenExpiration"); + b.Property("RefreshTokenExpiration") + .HasColumnType("int"); - b.Property("RefreshTokenUsage"); + b.Property("RefreshTokenUsage") + .HasColumnType("int"); - b.Property("RequireClientSecret"); + b.Property("RequireClientSecret") + .HasColumnType("bit"); - b.Property("RequireConsent"); + b.Property("RequireConsent") + .HasColumnType("bit"); - b.Property("RequirePkce"); + b.Property("RequirePkce") + .HasColumnType("bit"); - b.Property("SlidingRefreshTokenLifetime"); + b.Property("SlidingRefreshTokenLifetime") + .HasColumnType("int"); - b.Property("UpdateAccessTokenClaimsOnRefresh"); + b.Property("UpdateAccessTokenClaimsOnRefresh") + .HasColumnType("bit"); b.Property("UserCodeType") + .HasColumnType("nvarchar(100)") .HasMaxLength(100); - b.Property("UserSsoLifetime"); + b.Property("UserSsoLifetime") + .HasColumnType("int"); b.HasKey("Id"); - b.HasIndex("ClientId") - .IsUnique(); + b.HasIndex("ClientId"); b.ToTable("IdentityServerClients"); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("Type") + .HasColumnType("nvarchar(250)") .HasMaxLength(250); b.Property("Value") + .HasColumnType("nvarchar(250)") .HasMaxLength(250); b.HasKey("ClientId", "Type", "Value"); @@ -789,9 +983,11 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("Origin") + .HasColumnType("nvarchar(150)") .HasMaxLength(150); b.HasKey("ClientId", "Origin"); @@ -801,10 +997,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("GrantType") - .HasMaxLength(196); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.HasKey("ClientId", "GrantType"); @@ -813,10 +1011,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("Provider") - .HasMaxLength(64); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Provider"); @@ -825,10 +1025,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("PostLogoutRedirectUri") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "PostLogoutRedirectUri"); @@ -837,14 +1039,17 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("Key") - .HasMaxLength(64); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") .IsRequired() - .HasMaxLength(128); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "Key"); @@ -853,10 +1058,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("RedirectUri") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "RedirectUri"); @@ -865,10 +1072,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("Scope") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Scope"); @@ -877,18 +1086,23 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => { - b.Property("ClientId"); + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); - b.Property("Expiration"); + b.Property("Expiration") + .HasColumnType("datetime2"); b.HasKey("ClientId", "Type", "Value"); @@ -898,35 +1112,48 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => { b.Property("Key") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); b.Property("ClientId") .IsRequired() + .HasColumnType("nvarchar(200)") .HasMaxLength(200); - b.Property("ConcurrencyStamp"); + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); - b.Property("CreationTime"); + b.Property("CreationTime") + .HasColumnType("datetime2"); b.Property("Data") - .IsRequired(); + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); - b.Property("Expiration"); + b.Property("Expiration") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); - b.Property("Id"); + b.Property("Id") + .HasColumnType("uniqueidentifier"); b.Property("SubjectId") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); b.Property("Type") .IsRequired() + .HasColumnType("nvarchar(50)") .HasMaxLength(50); b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); b.ToTable("IdentityServerPersistedGrants"); @@ -934,10 +1161,12 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => { - b.Property("IdentityResourceId"); + b.Property("IdentityResourceId") + .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("IdentityResourceId", "Type"); @@ -947,57 +1176,75 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("Description") + .HasColumnType("nvarchar(1000)") .HasMaxLength(1000); b.Property("DisplayName") + .HasColumnType("nvarchar(200)") .HasMaxLength(200); - b.Property("Emphasize"); + b.Property("Emphasize") + .HasColumnType("bit"); - b.Property("Enabled"); + b.Property("Enabled") + .HasColumnType("bit"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(200)") .HasMaxLength(200); - b.Property("Properties"); + b.Property("Properties") + .HasColumnType("nvarchar(max)"); - b.Property("Required"); + b.Property("Required") + .HasColumnType("bit"); - b.Property("ShowInDiscoveryDocument"); + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); b.HasKey("Id"); @@ -1007,21 +1254,26 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderName") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.HasKey("Id"); @@ -1033,20 +1285,25 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(128)") .HasMaxLength(128); b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("ProviderName") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Value") .IsRequired() + .HasColumnType("nvarchar(2048)") .HasMaxLength(2048); b.HasKey("Id"); @@ -1059,40 +1316,51 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); b.Property("ConcurrencyStamp") .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); b.Property("CreationTime") - .HasColumnName("CreationTime"); + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); b.Property("CreatorId") - .HasColumnName("CreatorId"); + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); b.Property("DeleterId") - .HasColumnName("DeleterId"); + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); b.Property("DeletionTime") - .HasColumnName("DeletionTime"); + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnName("IsDeleted") + .HasColumnType("bit") .HasDefaultValue(false); b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); b.Property("LastModifierId") - .HasColumnName("LastModifierId"); + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); b.Property("Name") .IsRequired() + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.HasKey("Id"); @@ -1105,13 +1373,16 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => { - b.Property("TenantId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); b.Property("Name") + .HasColumnType("nvarchar(64)") .HasMaxLength(64); b.Property("Value") .IsRequired() + .HasColumnType("nvarchar(1024)") .HasMaxLength(1024); b.HasKey("TenantId", "Name"); @@ -1121,191 +1392,215 @@ namespace Acme.BookStore.BookManagement.Migrations modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) .WithMany("Actions") .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) .WithMany("EntityChanges") .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) .WithMany("PropertyChanges") .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => { - b.HasOne("Volo.Abp.Identity.IdentityRole") + b.HasOne("Volo.Abp.Identity.IdentityRole", null) .WithMany("Claims") .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Claims") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Logins") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => { - b.HasOne("Volo.Abp.Identity.IdentityRole") + b.HasOne("Volo.Abp.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Roles") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => { - b.HasOne("Volo.Abp.Identity.IdentityUser") + b.HasOne("Volo.Abp.Identity.IdentityUser", null) .WithMany("Tokens") .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) .WithMany("UserClaims") .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) .WithMany("Scopes") .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope") + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope", null) .WithMany("UserClaims") .HasForeignKey("ApiResourceId", "Name") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) .WithMany("Secrets") .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("Claims") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("AllowedCorsOrigins") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("AllowedGrantTypes") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("IdentityProviderRestrictions") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("PostLogoutRedirectUris") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("Properties") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("RedirectUris") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("AllowedScopes") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) .WithMany("ClientSecrets") .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => { - b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource") + b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null) .WithMany("UserClaims") .HasForeignKey("IdentityResourceId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => { - b.HasOne("Volo.Abp.TenantManagement.Tenant") + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) .WithMany("ConnectionStrings") .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); #pragma warning restore 612, 618 } diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.Designer.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.Designer.cs deleted file mode 100644 index 53187bf54d..0000000000 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.Designer.cs +++ /dev/null @@ -1,1374 +0,0 @@ -// -using System; -using Acme.BookStore.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace Acme.BookStore.Migrations -{ - [DbContext(typeof(BookStoreMigrationsDbContext))] - [Migration("20190603112909_Initial")] - partial class Initial - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ApplicationName") - .HasColumnName("ApplicationName") - .HasMaxLength(96); - - b.Property("BrowserInfo") - .HasColumnName("BrowserInfo") - .HasMaxLength(512); - - b.Property("ClientId") - .HasColumnName("ClientId") - .HasMaxLength(64); - - b.Property("ClientIpAddress") - .HasColumnName("ClientIpAddress") - .HasMaxLength(64); - - b.Property("ClientName") - .HasColumnName("ClientName") - .HasMaxLength(128); - - b.Property("Comments") - .HasColumnName("Comments") - .HasMaxLength(256); - - b.Property("ConcurrencyStamp"); - - b.Property("CorrelationId") - .HasColumnName("CorrelationId") - .HasMaxLength(64); - - b.Property("Exceptions") - .HasColumnName("Exceptions") - .HasMaxLength(4000); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("HttpMethod") - .HasColumnName("HttpMethod") - .HasMaxLength(16); - - b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); - - b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); - - b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TenantName"); - - b.Property("Url") - .HasColumnName("Url") - .HasMaxLength(256); - - b.Property("UserId") - .HasColumnName("UserId"); - - b.Property("UserName") - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("TenantId", "ExecutionTime"); - - b.HasIndex("TenantId", "UserId", "ExecutionTime"); - - b.ToTable("AbpAuditLogs"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("MethodName") - .HasColumnName("MethodName") - .HasMaxLength(128); - - b.Property("Parameters") - .HasColumnName("Parameters") - .HasMaxLength(2000); - - b.Property("ServiceName") - .HasColumnName("ServiceName") - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); - - b.ToTable("AbpAuditLogActions"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ChangeTime") - .HasColumnName("ChangeTime"); - - b.Property("ChangeType") - .HasColumnName("ChangeType"); - - b.Property("EntityId") - .IsRequired() - .HasColumnName("EntityId") - .HasMaxLength(128); - - b.Property("EntityTenantId"); - - b.Property("EntityTypeFullName") - .IsRequired() - .HasColumnName("EntityTypeFullName") - .HasMaxLength(128); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); - - b.ToTable("AbpEntityChanges"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("EntityChangeId"); - - b.Property("NewValue") - .HasColumnName("NewValue") - .HasMaxLength(512); - - b.Property("OriginalValue") - .HasColumnName("OriginalValue") - .HasMaxLength(512); - - b.Property("PropertyName") - .IsRequired() - .HasColumnName("PropertyName") - .HasMaxLength(128); - - b.Property("PropertyTypeFullName") - .IsRequired() - .HasColumnName("PropertyTypeFullName") - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("EntityChangeId"); - - b.ToTable("AbpEntityPropertyChanges"); - }); - - modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsAbandoned") - .ValueGeneratedOnAdd() - .HasDefaultValue(false); - - b.Property("JobArgs") - .IsRequired() - .HasMaxLength(1048576); - - b.Property("JobName") - .IsRequired() - .HasMaxLength(128); - - b.Property("LastTryTime"); - - b.Property("NextTryTime"); - - b.Property("Priority") - .ValueGeneratedOnAdd() - .HasDefaultValue((byte)15); - - b.Property("TryCount") - .ValueGeneratedOnAdd() - .HasDefaultValue((short)0); - - b.HasKey("Id"); - - b.HasIndex("IsAbandoned", "NextTryTime"); - - b.ToTable("AbpBackgroundJobs"); - }); - - modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpFeatureValues"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("Regex") - .HasMaxLength(512); - - b.Property("RegexDescription") - .HasMaxLength(128); - - b.Property("Required"); - - b.Property("ValueType"); - - b.HasKey("Id"); - - b.ToTable("AbpClaimTypes"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDefault") - .HasColumnName("IsDefault"); - - b.Property("IsPublic") - .HasColumnName("IsPublic"); - - b.Property("IsStatic") - .HasColumnName("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("NormalizedName") - .IsRequired() - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName"); - - b.ToTable("AbpRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AbpRoleClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount") - .ValueGeneratedOnAdd() - .HasColumnName("AccessFailedCount") - .HasDefaultValue(0); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Email") - .HasColumnName("Email") - .HasMaxLength(256); - - b.Property("EmailConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("EmailConfirmed") - .HasDefaultValue(false); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LockoutEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("LockoutEnabled") - .HasDefaultValue(false); - - b.Property("LockoutEnd"); - - b.Property("Name") - .HasColumnName("Name") - .HasMaxLength(64); - - b.Property("NormalizedEmail") - .HasColumnName("NormalizedEmail") - .HasMaxLength(256); - - b.Property("NormalizedUserName") - .IsRequired() - .HasColumnName("NormalizedUserName") - .HasMaxLength(256); - - b.Property("PasswordHash") - .HasColumnName("PasswordHash") - .HasMaxLength(256); - - b.Property("PhoneNumber") - .HasColumnName("PhoneNumber") - .HasMaxLength(16); - - b.Property("PhoneNumberConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("PhoneNumberConfirmed") - .HasDefaultValue(false); - - b.Property("SecurityStamp") - .IsRequired() - .HasColumnName("SecurityStamp") - .HasMaxLength(256); - - b.Property("Surname") - .HasColumnName("Surname") - .HasMaxLength(64); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TwoFactorEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("TwoFactorEnabled") - .HasDefaultValue(false); - - b.Property("UserName") - .IsRequired() - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("Email"); - - b.HasIndex("NormalizedEmail"); - - b.HasIndex("NormalizedUserName"); - - b.HasIndex("UserName"); - - b.ToTable("AbpUsers"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("TenantId"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AbpUserClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("ProviderDisplayName") - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(196); - - b.Property("TenantId"); - - b.HasKey("UserId", "LoginProvider"); - - b.HasIndex("LoginProvider", "ProviderKey"); - - b.ToTable("AbpUserLogins"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId", "UserId"); - - b.ToTable("AbpUserRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("Name") - .HasMaxLength(128); - - b.Property("TenantId"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AbpUserTokens"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.HasKey("Id"); - - b.ToTable("IdentityServerApiResources"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Type"); - - b.ToTable("IdentityServerApiClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("DisplayName") - .HasMaxLength(128); - - b.Property("Emphasize"); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("ApiResourceId", "Name"); - - b.ToTable("IdentityServerApiScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Name", "Type"); - - b.ToTable("IdentityServerApiScopeClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ApiResourceId", "Type", "Value"); - - b.ToTable("IdentityServerApiSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AbsoluteRefreshTokenLifetime"); - - b.Property("AccessTokenLifetime"); - - b.Property("AccessTokenType"); - - b.Property("AllowAccessTokensViaBrowser"); - - b.Property("AllowOfflineAccess"); - - b.Property("AllowPlainTextPkce"); - - b.Property("AllowRememberConsent"); - - b.Property("AlwaysIncludeUserClaimsInIdToken"); - - b.Property("AlwaysSendClientClaims"); - - b.Property("AuthorizationCodeLifetime"); - - b.Property("BackChannelLogoutSessionRequired"); - - b.Property("BackChannelLogoutUri") - .HasMaxLength(300); - - b.Property("ClientClaimsPrefix") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ClientName") - .HasMaxLength(200); - - b.Property("ClientUri") - .HasMaxLength(300); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("ConsentLifetime"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("EnableLocalLogin"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("FrontChannelLogoutSessionRequired"); - - b.Property("FrontChannelLogoutUri") - .HasMaxLength(300); - - b.Property("IdentityTokenLifetime"); - - b.Property("IncludeJwtId"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LogoUri") - .HasMaxLength(300); - - b.Property("PairWiseSubjectSalt") - .HasMaxLength(200); - - b.Property("ProtocolType") - .IsRequired() - .HasMaxLength(200); - - b.Property("RefreshTokenExpiration"); - - b.Property("RefreshTokenUsage"); - - b.Property("RequireClientSecret"); - - b.Property("RequireConsent"); - - b.Property("RequirePkce"); - - b.Property("SlidingRefreshTokenLifetime"); - - b.Property("UpdateAccessTokenClaimsOnRefresh"); - - b.HasKey("Id"); - - b.HasIndex("ClientId") - .IsUnique(); - - b.ToTable("IdentityServerClients"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(250); - - b.Property("Value") - .HasMaxLength(250); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.Property("ClientId"); - - b.Property("Origin") - .HasMaxLength(150); - - b.HasKey("ClientId", "Origin"); - - b.ToTable("IdentityServerClientCorsOrigins"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.Property("ClientId"); - - b.Property("GrantType") - .HasMaxLength(196); - - b.HasKey("ClientId", "GrantType"); - - b.ToTable("IdentityServerClientGrantTypes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.Property("ClientId"); - - b.Property("Provider") - .HasMaxLength(64); - - b.HasKey("ClientId", "Provider"); - - b.ToTable("IdentityServerClientIdPRestrictions"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("PostLogoutRedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "PostLogoutRedirectUri"); - - b.ToTable("IdentityServerClientPostLogoutRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.Property("ClientId"); - - b.Property("Key") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("ClientId", "Key"); - - b.ToTable("IdentityServerClientProperties"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("RedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "RedirectUri"); - - b.ToTable("IdentityServerClientRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.Property("ClientId"); - - b.Property("Scope") - .HasMaxLength(196); - - b.HasKey("ClientId", "Scope"); - - b.ToTable("IdentityServerClientScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => - { - b.Property("Key") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime"); - - b.Property("Data") - .IsRequired(); - - b.Property("Expiration"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Id"); - - b.Property("SubjectId") - .HasMaxLength(200); - - b.Property("Type") - .IsRequired() - .HasMaxLength(50); - - b.HasKey("Key"); - - b.HasIndex("SubjectId", "ClientId", "Type"); - - b.ToTable("IdentityServerPersistedGrants"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.Property("IdentityResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("IdentityResourceId", "Type"); - - b.ToTable("IdentityServerIdentityClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Emphasize"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("Id"); - - b.ToTable("IdentityServerIdentityResources"); - }); - - modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(64); - - b.Property("ProviderName") - .IsRequired() - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpPermissionGrants"); - }); - - modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(2048); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpSettings"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(64); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("AbpTenants"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.Property("TenantId"); - - b.Property("Name") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(1024); - - b.HasKey("TenantId", "Name"); - - b.ToTable("AbpTenantConnectionStrings"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") - .WithMany("PropertyChanges") - .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany("Claims") - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Claims") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Logins") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Roles") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Tokens") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Scopes") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId", "Name") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Secrets") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Claims") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedCorsOrigins") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedGrantTypes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("IdentityProviderRestrictions") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("PostLogoutRedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Properties") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("RedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedScopes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("ClientSecrets") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource") - .WithMany("UserClaims") - .HasForeignKey("IdentityResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.HasOne("Volo.Abp.TenantManagement.Tenant") - .WithMany("ConnectionStrings") - .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603113122_Created_Book_Entity.Designer.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603113122_Created_Book_Entity.Designer.cs deleted file mode 100644 index de5a467a66..0000000000 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603113122_Created_Book_Entity.Designer.cs +++ /dev/null @@ -1,1413 +0,0 @@ -// -using System; -using Acme.BookStore.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -namespace Acme.BookStore.Migrations -{ - [DbContext(typeof(BookStoreMigrationsDbContext))] - [Migration("20190603113122_Created_Book_Entity")] - partial class Created_Book_Entity - { - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") - .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - - modelBuilder.Entity("Acme.BookStore.Book", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("Price"); - - b.Property("PublishDate"); - - b.Property("Type"); - - b.HasKey("Id"); - - b.ToTable("AppBooks"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ApplicationName") - .HasColumnName("ApplicationName") - .HasMaxLength(96); - - b.Property("BrowserInfo") - .HasColumnName("BrowserInfo") - .HasMaxLength(512); - - b.Property("ClientId") - .HasColumnName("ClientId") - .HasMaxLength(64); - - b.Property("ClientIpAddress") - .HasColumnName("ClientIpAddress") - .HasMaxLength(64); - - b.Property("ClientName") - .HasColumnName("ClientName") - .HasMaxLength(128); - - b.Property("Comments") - .HasColumnName("Comments") - .HasMaxLength(256); - - b.Property("ConcurrencyStamp"); - - b.Property("CorrelationId") - .HasColumnName("CorrelationId") - .HasMaxLength(64); - - b.Property("Exceptions") - .HasColumnName("Exceptions") - .HasMaxLength(4000); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("HttpMethod") - .HasColumnName("HttpMethod") - .HasMaxLength(16); - - b.Property("HttpStatusCode") - .HasColumnName("HttpStatusCode"); - - b.Property("ImpersonatorTenantId") - .HasColumnName("ImpersonatorTenantId"); - - b.Property("ImpersonatorUserId") - .HasColumnName("ImpersonatorUserId"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TenantName"); - - b.Property("Url") - .HasColumnName("Url") - .HasMaxLength(256); - - b.Property("UserId") - .HasColumnName("UserId"); - - b.Property("UserName") - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("TenantId", "ExecutionTime"); - - b.HasIndex("TenantId", "UserId", "ExecutionTime"); - - b.ToTable("AbpAuditLogs"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ExecutionDuration") - .HasColumnName("ExecutionDuration"); - - b.Property("ExecutionTime") - .HasColumnName("ExecutionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("MethodName") - .HasColumnName("MethodName") - .HasMaxLength(128); - - b.Property("Parameters") - .HasColumnName("Parameters") - .HasMaxLength(2000); - - b.Property("ServiceName") - .HasColumnName("ServiceName") - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); - - b.ToTable("AbpAuditLogActions"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AuditLogId") - .HasColumnName("AuditLogId"); - - b.Property("ChangeTime") - .HasColumnName("ChangeTime"); - - b.Property("ChangeType") - .HasColumnName("ChangeType"); - - b.Property("EntityId") - .IsRequired() - .HasColumnName("EntityId") - .HasMaxLength(128); - - b.Property("EntityTenantId"); - - b.Property("EntityTypeFullName") - .IsRequired() - .HasColumnName("EntityTypeFullName") - .HasMaxLength(128); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("AuditLogId"); - - b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); - - b.ToTable("AbpEntityChanges"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("EntityChangeId"); - - b.Property("NewValue") - .HasColumnName("NewValue") - .HasMaxLength(512); - - b.Property("OriginalValue") - .HasColumnName("OriginalValue") - .HasMaxLength(512); - - b.Property("PropertyName") - .IsRequired() - .HasColumnName("PropertyName") - .HasMaxLength(128); - - b.Property("PropertyTypeFullName") - .IsRequired() - .HasColumnName("PropertyTypeFullName") - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("EntityChangeId"); - - b.ToTable("AbpEntityPropertyChanges"); - }); - - modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsAbandoned") - .ValueGeneratedOnAdd() - .HasDefaultValue(false); - - b.Property("JobArgs") - .IsRequired() - .HasMaxLength(1048576); - - b.Property("JobName") - .IsRequired() - .HasMaxLength(128); - - b.Property("LastTryTime"); - - b.Property("NextTryTime"); - - b.Property("Priority") - .ValueGeneratedOnAdd() - .HasDefaultValue((byte)15); - - b.Property("TryCount") - .ValueGeneratedOnAdd() - .HasDefaultValue((short)0); - - b.HasKey("Id"); - - b.HasIndex("IsAbandoned", "NextTryTime"); - - b.ToTable("AbpBackgroundJobs"); - }); - - modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpFeatureValues"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("Regex") - .HasMaxLength(512); - - b.Property("RegexDescription") - .HasMaxLength(128); - - b.Property("Required"); - - b.Property("ValueType"); - - b.HasKey("Id"); - - b.ToTable("AbpClaimTypes"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .IsRequired() - .HasColumnName("ConcurrencyStamp") - .HasMaxLength(256); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDefault") - .HasColumnName("IsDefault"); - - b.Property("IsPublic") - .HasColumnName("IsPublic"); - - b.Property("IsStatic") - .HasColumnName("IsStatic"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(256); - - b.Property("NormalizedName") - .IsRequired() - .HasMaxLength(256); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("NormalizedName"); - - b.ToTable("AbpRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("RoleId"); - - b.ToTable("AbpRoleClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount") - .ValueGeneratedOnAdd() - .HasColumnName("AccessFailedCount") - .HasDefaultValue(0); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Email") - .HasColumnName("Email") - .HasMaxLength(256); - - b.Property("EmailConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("EmailConfirmed") - .HasDefaultValue(false); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LockoutEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("LockoutEnabled") - .HasDefaultValue(false); - - b.Property("LockoutEnd"); - - b.Property("Name") - .HasColumnName("Name") - .HasMaxLength(64); - - b.Property("NormalizedEmail") - .HasColumnName("NormalizedEmail") - .HasMaxLength(256); - - b.Property("NormalizedUserName") - .IsRequired() - .HasColumnName("NormalizedUserName") - .HasMaxLength(256); - - b.Property("PasswordHash") - .HasColumnName("PasswordHash") - .HasMaxLength(256); - - b.Property("PhoneNumber") - .HasColumnName("PhoneNumber") - .HasMaxLength(16); - - b.Property("PhoneNumberConfirmed") - .ValueGeneratedOnAdd() - .HasColumnName("PhoneNumberConfirmed") - .HasDefaultValue(false); - - b.Property("SecurityStamp") - .IsRequired() - .HasColumnName("SecurityStamp") - .HasMaxLength(256); - - b.Property("Surname") - .HasColumnName("Surname") - .HasMaxLength(64); - - b.Property("TenantId") - .HasColumnName("TenantId"); - - b.Property("TwoFactorEnabled") - .ValueGeneratedOnAdd() - .HasColumnName("TwoFactorEnabled") - .HasDefaultValue(false); - - b.Property("UserName") - .IsRequired() - .HasColumnName("UserName") - .HasMaxLength(256); - - b.HasKey("Id"); - - b.HasIndex("Email"); - - b.HasIndex("NormalizedEmail"); - - b.HasIndex("NormalizedUserName"); - - b.HasIndex("UserName"); - - b.ToTable("AbpUsers"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ClaimType") - .IsRequired() - .HasMaxLength(256); - - b.Property("ClaimValue") - .HasMaxLength(1024); - - b.Property("TenantId"); - - b.Property("UserId"); - - b.HasKey("Id"); - - b.HasIndex("UserId"); - - b.ToTable("AbpUserClaims"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("ProviderDisplayName") - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(196); - - b.Property("TenantId"); - - b.HasKey("UserId", "LoginProvider"); - - b.HasIndex("LoginProvider", "ProviderKey"); - - b.ToTable("AbpUserLogins"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.Property("UserId"); - - b.Property("RoleId"); - - b.Property("TenantId"); - - b.HasKey("UserId", "RoleId"); - - b.HasIndex("RoleId", "UserId"); - - b.ToTable("AbpUserRoles"); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.Property("UserId"); - - b.Property("LoginProvider") - .HasMaxLength(64); - - b.Property("Name") - .HasMaxLength(128); - - b.Property("TenantId"); - - b.Property("Value"); - - b.HasKey("UserId", "LoginProvider", "Name"); - - b.ToTable("AbpUserTokens"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.HasKey("Id"); - - b.ToTable("IdentityServerApiResources"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Type"); - - b.ToTable("IdentityServerApiClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("DisplayName") - .HasMaxLength(128); - - b.Property("Emphasize"); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("ApiResourceId", "Name"); - - b.ToTable("IdentityServerApiScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.Property("ApiResourceId"); - - b.Property("Name") - .HasMaxLength(196); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("ApiResourceId", "Name", "Type"); - - b.ToTable("IdentityServerApiScopeClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.Property("ApiResourceId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ApiResourceId", "Type", "Value"); - - b.ToTable("IdentityServerApiSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AbsoluteRefreshTokenLifetime"); - - b.Property("AccessTokenLifetime"); - - b.Property("AccessTokenType"); - - b.Property("AllowAccessTokensViaBrowser"); - - b.Property("AllowOfflineAccess"); - - b.Property("AllowPlainTextPkce"); - - b.Property("AllowRememberConsent"); - - b.Property("AlwaysIncludeUserClaimsInIdToken"); - - b.Property("AlwaysSendClientClaims"); - - b.Property("AuthorizationCodeLifetime"); - - b.Property("BackChannelLogoutSessionRequired"); - - b.Property("BackChannelLogoutUri") - .HasMaxLength(300); - - b.Property("ClientClaimsPrefix") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ClientName") - .HasMaxLength(200); - - b.Property("ClientUri") - .HasMaxLength(300); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("ConsentLifetime"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("EnableLocalLogin"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("FrontChannelLogoutSessionRequired"); - - b.Property("FrontChannelLogoutUri") - .HasMaxLength(300); - - b.Property("IdentityTokenLifetime"); - - b.Property("IncludeJwtId"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("LogoUri") - .HasMaxLength(300); - - b.Property("PairWiseSubjectSalt") - .HasMaxLength(200); - - b.Property("ProtocolType") - .IsRequired() - .HasMaxLength(200); - - b.Property("RefreshTokenExpiration"); - - b.Property("RefreshTokenUsage"); - - b.Property("RequireClientSecret"); - - b.Property("RequireConsent"); - - b.Property("RequirePkce"); - - b.Property("SlidingRefreshTokenLifetime"); - - b.Property("UpdateAccessTokenClaimsOnRefresh"); - - b.HasKey("Id"); - - b.HasIndex("ClientId") - .IsUnique(); - - b.ToTable("IdentityServerClients"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(250); - - b.Property("Value") - .HasMaxLength(250); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.Property("ClientId"); - - b.Property("Origin") - .HasMaxLength(150); - - b.HasKey("ClientId", "Origin"); - - b.ToTable("IdentityServerClientCorsOrigins"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.Property("ClientId"); - - b.Property("GrantType") - .HasMaxLength(196); - - b.HasKey("ClientId", "GrantType"); - - b.ToTable("IdentityServerClientGrantTypes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.Property("ClientId"); - - b.Property("Provider") - .HasMaxLength(64); - - b.HasKey("ClientId", "Provider"); - - b.ToTable("IdentityServerClientIdPRestrictions"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("PostLogoutRedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "PostLogoutRedirectUri"); - - b.ToTable("IdentityServerClientPostLogoutRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.Property("ClientId"); - - b.Property("Key") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(128); - - b.HasKey("ClientId", "Key"); - - b.ToTable("IdentityServerClientProperties"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.Property("ClientId"); - - b.Property("RedirectUri") - .HasMaxLength(200); - - b.HasKey("ClientId", "RedirectUri"); - - b.ToTable("IdentityServerClientRedirectUris"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.Property("ClientId"); - - b.Property("Scope") - .HasMaxLength(196); - - b.HasKey("ClientId", "Scope"); - - b.ToTable("IdentityServerClientScopes"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.Property("ClientId"); - - b.Property("Type") - .HasMaxLength(32); - - b.Property("Value") - .HasMaxLength(196); - - b.Property("Description") - .HasMaxLength(256); - - b.Property("Expiration"); - - b.HasKey("ClientId", "Type", "Value"); - - b.ToTable("IdentityServerClientSecrets"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => - { - b.Property("Key") - .HasMaxLength(200); - - b.Property("ClientId") - .IsRequired() - .HasMaxLength(200); - - b.Property("ConcurrencyStamp"); - - b.Property("CreationTime"); - - b.Property("Data") - .IsRequired(); - - b.Property("Expiration"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("Id"); - - b.Property("SubjectId") - .HasMaxLength(200); - - b.Property("Type") - .IsRequired() - .HasMaxLength(50); - - b.HasKey("Key"); - - b.HasIndex("SubjectId", "ClientId", "Type"); - - b.ToTable("IdentityServerPersistedGrants"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.Property("IdentityResourceId"); - - b.Property("Type") - .HasMaxLength(196); - - b.HasKey("IdentityResourceId", "Type"); - - b.ToTable("IdentityServerIdentityClaims"); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("Description") - .HasMaxLength(1000); - - b.Property("DisplayName") - .HasMaxLength(200); - - b.Property("Emphasize"); - - b.Property("Enabled"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(200); - - b.Property("Required"); - - b.Property("ShowInDiscoveryDocument"); - - b.HasKey("Id"); - - b.ToTable("IdentityServerIdentityResources"); - }); - - modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .IsRequired() - .HasMaxLength(64); - - b.Property("ProviderName") - .IsRequired() - .HasMaxLength(64); - - b.Property("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpPermissionGrants"); - }); - - modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("Name") - .IsRequired() - .HasMaxLength(128); - - b.Property("ProviderKey") - .HasMaxLength(64); - - b.Property("ProviderName") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(2048); - - b.HasKey("Id"); - - b.HasIndex("Name", "ProviderName", "ProviderKey"); - - b.ToTable("AbpSettings"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnName("DeletionTime"); - - b.Property("ExtraProperties") - .HasColumnName("ExtraProperties"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnName("IsDeleted") - .HasDefaultValue(false); - - b.Property("LastModificationTime") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnName("LastModifierId"); - - b.Property("Name") - .IsRequired() - .HasMaxLength(64); - - b.HasKey("Id"); - - b.HasIndex("Name") - .IsUnique(); - - b.ToTable("AbpTenants"); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.Property("TenantId"); - - b.Property("Name") - .HasMaxLength(64); - - b.Property("Value") - .IsRequired() - .HasMaxLength(1024); - - b.HasKey("TenantId", "Name"); - - b.ToTable("AbpTenantConnectionStrings"); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("Actions") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.AuditLog") - .WithMany("EntityChanges") - .HasForeignKey("AuditLogId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => - { - b.HasOne("Volo.Abp.AuditLogging.EntityChange") - .WithMany("PropertyChanges") - .HasForeignKey("EntityChangeId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany("Claims") - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Claims") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Logins") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => - { - b.HasOne("Volo.Abp.Identity.IdentityRole") - .WithMany() - .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); - - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Roles") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => - { - b.HasOne("Volo.Abp.Identity.IdentityUser") - .WithMany("Tokens") - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Scopes") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope") - .WithMany("UserClaims") - .HasForeignKey("ApiResourceId", "Name") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource") - .WithMany("Secrets") - .HasForeignKey("ApiResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Claims") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedCorsOrigins") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedGrantTypes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("IdentityProviderRestrictions") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("PostLogoutRedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("Properties") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("RedirectUris") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("AllowedScopes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => - { - b.HasOne("Volo.Abp.IdentityServer.Clients.Client") - .WithMany("ClientSecrets") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => - { - b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource") - .WithMany("UserClaims") - .HasForeignKey("IdentityResourceId") - .OnDelete(DeleteBehavior.Cascade); - }); - - modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => - { - b.HasOne("Volo.Abp.TenantManagement.Tenant") - .WithMany("ConnectionStrings") - .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.cs deleted file mode 100644 index c0e8a736bf..0000000000 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.cs +++ /dev/null @@ -1,79 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -namespace Acme.BookStore.Migrations -{ - public partial class Upgraded_To_Abp_0_21 : Migration - { - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_IdentityServerClients_ClientId", - table: "IdentityServerClients"); - - migrationBuilder.AddColumn( - name: "Properties", - table: "IdentityServerIdentityResources", - nullable: true); - - migrationBuilder.AddColumn( - name: "DeviceCodeLifetime", - table: "IdentityServerClients", - nullable: false, - defaultValue: 0); - - migrationBuilder.AddColumn( - name: "UserCodeType", - table: "IdentityServerClients", - maxLength: 100, - nullable: true); - - migrationBuilder.AddColumn( - name: "UserSsoLifetime", - table: "IdentityServerClients", - nullable: true); - - migrationBuilder.AddColumn( - name: "Properties", - table: "IdentityServerApiResources", - nullable: true); - - migrationBuilder.CreateIndex( - name: "IX_IdentityServerClients_ClientId", - table: "IdentityServerClients", - column: "ClientId"); - } - - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropIndex( - name: "IX_IdentityServerClients_ClientId", - table: "IdentityServerClients"); - - migrationBuilder.DropColumn( - name: "Properties", - table: "IdentityServerIdentityResources"); - - migrationBuilder.DropColumn( - name: "DeviceCodeLifetime", - table: "IdentityServerClients"); - - migrationBuilder.DropColumn( - name: "UserCodeType", - table: "IdentityServerClients"); - - migrationBuilder.DropColumn( - name: "UserSsoLifetime", - table: "IdentityServerClients"); - - migrationBuilder.DropColumn( - name: "Properties", - table: "IdentityServerApiResources"); - - migrationBuilder.CreateIndex( - name: "IX_IdentityServerClients_ClientId", - table: "IdentityServerClients", - column: "ClientId", - unique: true); - } - } -} diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.Designer.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.Designer.cs new file mode 100644 index 0000000000..6d33227240 --- /dev/null +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.Designer.cs @@ -0,0 +1,1696 @@ +// +using System; +using Acme.BookStore.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace Acme.BookStore.Migrations +{ + [DbContext(typeof(BookStoreMigrationsDbContext))] + [Migration("20191018075950_Initial")] + partial class Initial + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128) + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationName") + .HasColumnName("ApplicationName") + .HasColumnType("nvarchar(96)") + .HasMaxLength(96); + + b.Property("BrowserInfo") + .HasColumnName("BrowserInfo") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("ClientId") + .HasColumnName("ClientId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientIpAddress") + .HasColumnName("ClientIpAddress") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ClientName") + .HasColumnName("ClientName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Comments") + .HasColumnName("Comments") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CorrelationId") + .HasColumnName("CorrelationId") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Exceptions") + .HasColumnName("Exceptions") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("HttpMethod") + .HasColumnName("HttpMethod") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("HttpStatusCode") + .HasColumnName("HttpStatusCode") + .HasColumnType("int"); + + b.Property("ImpersonatorTenantId") + .HasColumnName("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("ImpersonatorUserId") + .HasColumnName("ImpersonatorUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantName") + .HasColumnType("nvarchar(max)"); + + b.Property("Url") + .HasColumnName("Url") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("UserId") + .HasColumnName("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserName") + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ExecutionDuration") + .HasColumnName("ExecutionDuration") + .HasColumnType("int"); + + b.Property("ExecutionTime") + .HasColumnName("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("MethodName") + .HasColumnName("MethodName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Parameters") + .HasColumnName("Parameters") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ServiceName") + .HasColumnName("ServiceName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnName("AuditLogId") + .HasColumnType("uniqueidentifier"); + + b.Property("ChangeTime") + .HasColumnName("ChangeTime") + .HasColumnType("datetime2"); + + b.Property("ChangeType") + .HasColumnName("ChangeType") + .HasColumnType("tinyint"); + + b.Property("EntityId") + .IsRequired() + .HasColumnName("EntityId") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasColumnName("EntityTypeFullName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); + + b.Property("NewValue") + .HasColumnName("NewValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("OriginalValue") + .HasColumnName("OriginalValue") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("PropertyName") + .IsRequired() + .HasColumnName("PropertyName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasColumnName("PropertyTypeFullName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsAbandoned") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("JobArgs") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(1048576); + + b.Property("JobName") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("LastTryTime") + .HasColumnType("datetime2"); + + b.Property("NextTryTime") + .HasColumnType("datetime2"); + + b.Property("Priority") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint") + .HasDefaultValue((byte)15); + + b.Property("TryCount") + .ValueGeneratedOnAdd() + .HasColumnType("smallint") + .HasDefaultValue((short)0); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs"); + }); + + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpFeatureValues"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Description") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Regex") + .HasColumnType("nvarchar(512)") + .HasMaxLength(512); + + b.Property("RegexDescription") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ValueType") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDefault") + .HasColumnName("IsDefault") + .HasColumnType("bit"); + + b.Property("IsPublic") + .HasColumnName("IsPublic") + .HasColumnType("bit"); + + b.Property("IsStatic") + .HasColumnName("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedName") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnName("AccessFailedCount") + .HasColumnType("int") + .HasDefaultValue(0); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Email") + .HasColumnName("Email") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("EmailConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("LockoutEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("Name") + .HasColumnName("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("NormalizedEmail") + .HasColumnName("NormalizedEmail") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .IsRequired() + .HasColumnName("NormalizedUserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnName("PasswordHash") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("PhoneNumber") + .HasColumnName("PhoneNumber") + .HasColumnType("nvarchar(16)") + .HasMaxLength(16); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnName("PhoneNumberConfirmed") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("SecurityStamp") + .IsRequired() + .HasColumnName("SecurityStamp") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("Surname") + .HasColumnName("Surname") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnName("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnName("TwoFactorEnabled") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("UserName") + .IsRequired() + .HasColumnName("UserName") + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasColumnType("nvarchar(256)") + .HasMaxLength(256); + + b.Property("ClaimValue") + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderDisplayName") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(196)") + .HasMaxLength(196); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Name") + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerApiResources"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Type"); + + b.ToTable("IdentityServerApiClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("ApiResourceId", "Name"); + + b.ToTable("IdentityServerApiScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ApiResourceId", "Name", "Type"); + + b.ToTable("IdentityServerApiScopeClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.Property("ApiResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ApiResourceId", "Type", "Value"); + + b.ToTable("IdentityServerApiSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AbsoluteRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenLifetime") + .HasColumnType("int"); + + b.Property("AccessTokenType") + .HasColumnType("int"); + + b.Property("AllowAccessTokensViaBrowser") + .HasColumnType("bit"); + + b.Property("AllowOfflineAccess") + .HasColumnType("bit"); + + b.Property("AllowPlainTextPkce") + .HasColumnType("bit"); + + b.Property("AllowRememberConsent") + .HasColumnType("bit"); + + b.Property("AlwaysIncludeUserClaimsInIdToken") + .HasColumnType("bit"); + + b.Property("AlwaysSendClientClaims") + .HasColumnType("bit"); + + b.Property("AuthorizationCodeLifetime") + .HasColumnType("int"); + + b.Property("BackChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("BackChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ClientClaimsPrefix") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("ConsentLifetime") + .HasColumnType("int"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DeviceCodeLifetime") + .HasColumnType("int"); + + b.Property("EnableLocalLogin") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("FrontChannelLogoutSessionRequired") + .HasColumnType("bit"); + + b.Property("FrontChannelLogoutUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("IdentityTokenLifetime") + .HasColumnType("int"); + + b.Property("IncludeJwtId") + .HasColumnType("bit"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("LogoUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("PairWiseSubjectSalt") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ProtocolType") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("RefreshTokenExpiration") + .HasColumnType("int"); + + b.Property("RefreshTokenUsage") + .HasColumnType("int"); + + b.Property("RequireClientSecret") + .HasColumnType("bit"); + + b.Property("RequireConsent") + .HasColumnType("bit"); + + b.Property("RequirePkce") + .HasColumnType("bit"); + + b.Property("SlidingRefreshTokenLifetime") + .HasColumnType("int"); + + b.Property("UpdateAccessTokenClaimsOnRefresh") + .HasColumnType("bit"); + + b.Property("UserCodeType") + .HasColumnType("nvarchar(100)") + .HasMaxLength(100); + + b.Property("UserSsoLifetime") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("IdentityServerClients"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Origin") + .HasColumnType("nvarchar(150)") + .HasMaxLength(150); + + b.HasKey("ClientId", "Origin"); + + b.ToTable("IdentityServerClientCorsOrigins"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("GrantType") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.HasKey("ClientId", "GrantType"); + + b.ToTable("IdentityServerClientGrantTypes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Provider") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Provider"); + + b.ToTable("IdentityServerClientIdPRestrictions"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("PostLogoutRedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "PostLogoutRedirectUri"); + + b.ToTable("IdentityServerClientPostLogoutRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Key") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "Key"); + + b.ToTable("IdentityServerClientProperties"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("RedirectUri") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.HasKey("ClientId", "RedirectUri"); + + b.ToTable("IdentityServerClientRedirectUris"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Scope") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("ClientId", "Scope"); + + b.ToTable("IdentityServerClientScopes"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.Property("ClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); + + b.Property("Value") + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); + + b.Property("Description") + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.HasKey("ClientId", "Type", "Value"); + + b.ToTable("IdentityServerClientSecrets"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b => + { + b.Property("Key") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ClientId") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("Data") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); + + b.Property("Expiration") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("SubjectId") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Type") + .IsRequired() + .HasColumnType("nvarchar(50)") + .HasMaxLength(50); + + b.HasKey("Key"); + + b.HasIndex("Expiration"); + + b.HasIndex("SubjectId", "ClientId", "Type"); + + b.ToTable("IdentityServerPersistedGrants"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.Property("IdentityResourceId") + .HasColumnType("uniqueidentifier"); + + b.Property("Type") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.HasKey("IdentityResourceId", "Type"); + + b.ToTable("IdentityServerIdentityClaims"); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("Description") + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); + + b.Property("DisplayName") + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Emphasize") + .HasColumnType("bit"); + + b.Property("Enabled") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ShowInDiscoveryDocument") + .HasColumnType("bit"); + + b.HasKey("Id"); + + b.ToTable("IdentityServerIdentityResources"); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpPermissionGrants"); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(128)") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("ProviderName") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(2048)") + .HasMaxLength(2048); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey"); + + b.ToTable("AbpSettings"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnName("ConcurrencyStamp") + .HasColumnType("nvarchar(max)"); + + b.Property("CreationTime") + .HasColumnName("CreationTime") + .HasColumnType("datetime2"); + + b.Property("CreatorId") + .HasColumnName("CreatorId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeleterId") + .HasColumnName("DeleterId") + .HasColumnType("uniqueidentifier"); + + b.Property("DeletionTime") + .HasColumnName("DeletionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .HasColumnName("ExtraProperties") + .HasColumnType("nvarchar(max)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnName("IsDeleted") + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("LastModificationTime") + .HasColumnName("LastModificationTime") + .HasColumnType("datetime2"); + + b.Property("LastModifierId") + .HasColumnName("LastModifierId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpTenants"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasColumnType("nvarchar(64)") + .HasMaxLength(64); + + b.Property("Value") + .IsRequired() + .HasColumnType("nvarchar(1024)") + .HasMaxLength(1024); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Scopes") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiScopeClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiScope", null) + .WithMany("UserClaims") + .HasForeignKey("ApiResourceId", "Name") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null) + .WithMany("Secrets") + .HasForeignKey("ApiResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Claims") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedCorsOrigins") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedGrantTypes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("IdentityProviderRestrictions") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("PostLogoutRedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("Properties") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("RedirectUris") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("AllowedScopes") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b => + { + b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null) + .WithMany("ClientSecrets") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityClaim", b => + { + b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null) + .WithMany("UserClaims") + .HasForeignKey("IdentityResourceId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.cs similarity index 95% rename from samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.cs rename to samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.cs index 45cd778b73..cc04cddbf2 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603112909_Initial.cs +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018075950_Initial.cs @@ -218,7 +218,8 @@ namespace Acme.BookStore.Migrations Name = table.Column(maxLength: 200, nullable: false), DisplayName = table.Column(maxLength: 200, nullable: true), Description = table.Column(maxLength: 1000, nullable: true), - Enabled = table.Column(nullable: false) + Enabled = table.Column(nullable: false), + Properties = table.Column(nullable: true) }, constraints: table => { @@ -242,8 +243,8 @@ namespace Acme.BookStore.Migrations ClientId = table.Column(maxLength: 200, nullable: false), ClientName = table.Column(maxLength: 200, nullable: true), Description = table.Column(maxLength: 1000, nullable: true), - ClientUri = table.Column(maxLength: 300, nullable: true), - LogoUri = table.Column(maxLength: 300, nullable: true), + ClientUri = table.Column(maxLength: 2000, nullable: true), + LogoUri = table.Column(maxLength: 2000, nullable: true), Enabled = table.Column(nullable: false), ProtocolType = table.Column(maxLength: 200, nullable: false), RequireClientSecret = table.Column(nullable: false), @@ -253,9 +254,9 @@ namespace Acme.BookStore.Migrations RequirePkce = table.Column(nullable: false), AllowPlainTextPkce = table.Column(nullable: false), AllowAccessTokensViaBrowser = table.Column(nullable: false), - FrontChannelLogoutUri = table.Column(maxLength: 300, nullable: true), + FrontChannelLogoutUri = table.Column(maxLength: 2000, nullable: true), FrontChannelLogoutSessionRequired = table.Column(nullable: false), - BackChannelLogoutUri = table.Column(maxLength: 300, nullable: true), + BackChannelLogoutUri = table.Column(maxLength: 2000, nullable: true), BackChannelLogoutSessionRequired = table.Column(nullable: false), AllowOfflineAccess = table.Column(nullable: false), IdentityTokenLifetime = table.Column(nullable: false), @@ -272,7 +273,10 @@ namespace Acme.BookStore.Migrations IncludeJwtId = table.Column(nullable: false), AlwaysSendClientClaims = table.Column(nullable: false), ClientClaimsPrefix = table.Column(maxLength: 200, nullable: true), - PairWiseSubjectSalt = table.Column(maxLength: 200, nullable: true) + PairWiseSubjectSalt = table.Column(maxLength: 200, nullable: true), + UserSsoLifetime = table.Column(nullable: true), + UserCodeType = table.Column(maxLength: 100, nullable: true), + DeviceCodeLifetime = table.Column(nullable: false) }, constraints: table => { @@ -299,7 +303,8 @@ namespace Acme.BookStore.Migrations Enabled = table.Column(nullable: false), Required = table.Column(nullable: false), Emphasize = table.Column(nullable: false), - ShowInDiscoveryDocument = table.Column(nullable: false) + ShowInDiscoveryDocument = table.Column(nullable: false), + Properties = table.Column(nullable: true) }, constraints: table => { @@ -319,7 +324,7 @@ namespace Acme.BookStore.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { @@ -508,7 +513,7 @@ namespace Acme.BookStore.Migrations name: "IdentityServerApiClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), ApiResourceId = table.Column(nullable: false) }, constraints: table => @@ -527,9 +532,9 @@ namespace Acme.BookStore.Migrations columns: table => new { ApiResourceId = table.Column(nullable: false), - Name = table.Column(maxLength: 196, nullable: false), - DisplayName = table.Column(maxLength: 128, nullable: true), - Description = table.Column(maxLength: 256, nullable: true), + Name = table.Column(maxLength: 200, nullable: false), + DisplayName = table.Column(maxLength: 200, nullable: true), + Description = table.Column(maxLength: 1000, nullable: true), Required = table.Column(nullable: false), Emphasize = table.Column(nullable: false), ShowInDiscoveryDocument = table.Column(nullable: false) @@ -549,10 +554,10 @@ namespace Acme.BookStore.Migrations name: "IdentityServerApiSecrets", columns: table => new { - Type = table.Column(maxLength: 32, nullable: false), - Value = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 4000, nullable: false), ApiResourceId = table.Column(nullable: false), - Description = table.Column(maxLength: 256, nullable: true), + Description = table.Column(maxLength: 2000, nullable: true), Expiration = table.Column(nullable: true) }, constraints: table => @@ -608,7 +613,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - GrantType = table.Column(maxLength: 196, nullable: false) + GrantType = table.Column(maxLength: 250, nullable: false) }, constraints: table => { @@ -626,7 +631,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Provider = table.Column(maxLength: 64, nullable: false) + Provider = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -644,7 +649,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - PostLogoutRedirectUri = table.Column(maxLength: 200, nullable: false) + PostLogoutRedirectUri = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -662,8 +667,8 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Key = table.Column(maxLength: 64, nullable: false), - Value = table.Column(maxLength: 128, nullable: false) + Key = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -681,7 +686,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - RedirectUri = table.Column(maxLength: 200, nullable: false) + RedirectUri = table.Column(maxLength: 2000, nullable: false) }, constraints: table => { @@ -699,7 +704,7 @@ namespace Acme.BookStore.Migrations columns: table => new { ClientId = table.Column(nullable: false), - Scope = table.Column(maxLength: 196, nullable: false) + Scope = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -716,10 +721,10 @@ namespace Acme.BookStore.Migrations name: "IdentityServerClientSecrets", columns: table => new { - Type = table.Column(maxLength: 32, nullable: false), - Value = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 250, nullable: false), + Value = table.Column(maxLength: 4000, nullable: false), ClientId = table.Column(nullable: false), - Description = table.Column(maxLength: 256, nullable: true), + Description = table.Column(maxLength: 2000, nullable: true), Expiration = table.Column(nullable: true) }, constraints: table => @@ -737,7 +742,7 @@ namespace Acme.BookStore.Migrations name: "IdentityServerIdentityClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), IdentityResourceId = table.Column(nullable: false) }, constraints: table => @@ -778,9 +783,9 @@ namespace Acme.BookStore.Migrations name: "IdentityServerApiScopeClaims", columns: table => new { - Type = table.Column(maxLength: 196, nullable: false), + Type = table.Column(maxLength: 200, nullable: false), ApiResourceId = table.Column(nullable: false), - Name = table.Column(maxLength: 196, nullable: false) + Name = table.Column(maxLength: 200, nullable: false) }, constraints: table => { @@ -902,8 +907,12 @@ namespace Acme.BookStore.Migrations migrationBuilder.CreateIndex( name: "IX_IdentityServerClients_ClientId", table: "IdentityServerClients", - column: "ClientId", - unique: true); + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_IdentityServerPersistedGrants_Expiration", + table: "IdentityServerPersistedGrants", + column: "Expiration"); migrationBuilder.CreateIndex( name: "IX_IdentityServerPersistedGrants_SubjectId_ClientId_Type", diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.Designer.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018080014_Created_Book_Entity.Designer.cs similarity index 96% rename from samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.Designer.cs rename to samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018080014_Created_Book_Entity.Designer.cs index 19111ba49e..3c433dbd58 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190924133131_Upgraded_To_Abp_0_21.Designer.cs +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018080014_Created_Book_Entity.Designer.cs @@ -10,8 +10,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Acme.BookStore.Migrations { [DbContext(typeof(BookStoreMigrationsDbContext))] - [Migration("20190924133131_Upgraded_To_Abp_0_21")] - partial class Upgraded_To_Abp_0_21 + [Migration("20191018080014_Created_Book_Entity")] + partial class Created_Book_Entity { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -843,8 +843,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Type"); @@ -857,16 +857,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); b.Property("DisplayName") - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Emphasize") .HasColumnType("bit"); @@ -888,12 +888,12 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Name", "Type"); @@ -906,16 +906,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -965,8 +965,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("BackChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ClientClaimsPrefix") .HasColumnType("nvarchar(200)") @@ -982,8 +982,8 @@ namespace Acme.BookStore.Migrations .HasMaxLength(200); b.Property("ClientUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ConcurrencyStamp") .IsConcurrencyToken() @@ -1030,8 +1030,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("FrontChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("IdentityTokenLifetime") .HasColumnType("int"); @@ -1054,8 +1054,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("LogoUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("PairWiseSubjectSalt") .HasColumnType("nvarchar(200)") @@ -1139,8 +1139,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("GrantType") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.HasKey("ClientId", "GrantType"); @@ -1153,8 +1153,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Provider") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Provider"); @@ -1167,8 +1167,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("PostLogoutRedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "PostLogoutRedirectUri"); @@ -1181,13 +1181,13 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Key") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") .IsRequired() - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "Key"); @@ -1200,8 +1200,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("RedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "RedirectUri"); @@ -1214,8 +1214,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Scope") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Scope"); @@ -1228,16 +1228,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1266,7 +1266,8 @@ namespace Acme.BookStore.Migrations b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)"); + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1289,6 +1290,8 @@ namespace Acme.BookStore.Migrations b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); b.ToTable("IdentityServerPersistedGrants"); @@ -1300,8 +1303,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("IdentityResourceId", "Type"); diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603113122_Created_Book_Entity.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018080014_Created_Book_Entity.cs similarity index 100% rename from samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20190603113122_Created_Book_Entity.cs rename to samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/20191018080014_Created_Book_Entity.cs diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs index 603bd3ee97..ced549a616 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/Migrations/BookStoreMigrationsDbContextModelSnapshot.cs @@ -841,8 +841,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Type"); @@ -855,16 +855,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(1000)") + .HasMaxLength(1000); b.Property("DisplayName") - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Emphasize") .HasColumnType("bit"); @@ -886,12 +886,12 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Name") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ApiResourceId", "Name", "Type"); @@ -904,16 +904,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -963,8 +963,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("BackChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ClientClaimsPrefix") .HasColumnType("nvarchar(200)") @@ -980,8 +980,8 @@ namespace Acme.BookStore.Migrations .HasMaxLength(200); b.Property("ClientUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("ConcurrencyStamp") .IsConcurrencyToken() @@ -1028,8 +1028,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("bit"); b.Property("FrontChannelLogoutUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("IdentityTokenLifetime") .HasColumnType("int"); @@ -1052,8 +1052,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("LogoUri") - .HasColumnType("nvarchar(300)") - .HasMaxLength(300); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("PairWiseSubjectSalt") .HasColumnType("nvarchar(200)") @@ -1137,8 +1137,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("GrantType") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.HasKey("ClientId", "GrantType"); @@ -1151,8 +1151,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Provider") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Provider"); @@ -1165,8 +1165,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("PostLogoutRedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "PostLogoutRedirectUri"); @@ -1179,13 +1179,13 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Key") - .HasColumnType("nvarchar(64)") - .HasMaxLength(64); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") .IsRequired() - .HasColumnType("nvarchar(128)") - .HasMaxLength(128); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "Key"); @@ -1198,8 +1198,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("RedirectUri") - .HasColumnType("nvarchar(200)") - .HasMaxLength(200); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.HasKey("ClientId", "RedirectUri"); @@ -1212,8 +1212,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Scope") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("ClientId", "Scope"); @@ -1226,16 +1226,16 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(32)") - .HasMaxLength(32); + .HasColumnType("nvarchar(250)") + .HasMaxLength(250); b.Property("Value") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(4000)") + .HasMaxLength(4000); b.Property("Description") - .HasColumnType("nvarchar(256)") - .HasMaxLength(256); + .HasColumnType("nvarchar(2000)") + .HasMaxLength(2000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1264,7 +1264,8 @@ namespace Acme.BookStore.Migrations b.Property("Data") .IsRequired() - .HasColumnType("nvarchar(max)"); + .HasColumnType("nvarchar(max)") + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); @@ -1287,6 +1288,8 @@ namespace Acme.BookStore.Migrations b.HasKey("Key"); + b.HasIndex("Expiration"); + b.HasIndex("SubjectId", "ClientId", "Type"); b.ToTable("IdentityServerPersistedGrants"); @@ -1298,8 +1301,8 @@ namespace Acme.BookStore.Migrations .HasColumnType("uniqueidentifier"); b.Property("Type") - .HasColumnType("nvarchar(196)") - .HasMaxLength(196); + .HasColumnType("nvarchar(200)") + .HasMaxLength(200); b.HasKey("IdentityResourceId", "Type"); diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191010023719_Initial.Designer.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191018081444_Initial.Designer.cs similarity index 99% rename from samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191010023719_Initial.Designer.cs rename to samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191018081444_Initial.Designer.cs index 134a658f25..7cf33e8b48 100644 --- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191010023719_Initial.Designer.cs +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191018081444_Initial.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace DashboardDemo.Migrations { [DbContext(typeof(DashboardDemoMigrationsDbContext))] - [Migration("20191010023719_Initial")] + [Migration("20191018081444_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1217,7 +1217,7 @@ namespace DashboardDemo.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191010023719_Initial.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191018081444_Initial.cs similarity index 99% rename from samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191010023719_Initial.cs rename to samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191018081444_Initial.cs index fc139d6f52..c866a45920 100644 --- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191010023719_Initial.cs +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/20191018081444_Initial.cs @@ -324,7 +324,7 @@ namespace DashboardDemo.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(maxLength: 5000, nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs index 6ec438f8dd..7849c5b198 100644 --- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/Migrations/DashboardDemoMigrationsDbContextModelSnapshot.cs @@ -1215,7 +1215,7 @@ namespace DashboardDemo.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191010024505_Initial.Designer.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191018081320_Initial.Designer.cs similarity index 99% rename from samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191010024505_Initial.Designer.cs rename to samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191018081320_Initial.Designer.cs index ea39239edb..874183e1ee 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191010024505_Initial.Designer.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191018081320_Initial.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace AuthServer.Host.Migrations { [DbContext(typeof(AuthServerDbContext))] - [Migration("20191010024505_Initial")] + [Migration("20191018081320_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1131,7 +1131,7 @@ namespace AuthServer.Host.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191010024505_Initial.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191018081320_Initial.cs similarity index 99% rename from samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191010024505_Initial.cs rename to samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191018081320_Initial.cs index f1e47fcf68..a1448d0e0c 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191010024505_Initial.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/20191018081320_Initial.cs @@ -267,7 +267,7 @@ namespace AuthServer.Host.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(maxLength: 5000, nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { diff --git a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs index 0224c317e5..c79748f7f9 100644 --- a/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs +++ b/samples/MicroserviceDemo/applications/AuthServer.Host/Migrations/AuthServerDbContextModelSnapshot.cs @@ -1129,7 +1129,7 @@ namespace AuthServer.Host.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191010024652_Initial.Designer.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.Designer.cs similarity index 99% rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191010024652_Initial.Designer.cs rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.Designer.cs index ca4d0263bf..985152899f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191010024652_Initial.Designer.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.Designer.cs @@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(MyProjectNameMigrationsDbContext))] - [Migration("20191010024652_Initial")] + [Migration("20191018080830_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1217,7 +1217,7 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191010024652_Initial.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.cs similarity index 99% rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191010024652_Initial.cs rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.cs index 5a7c9a3007..e9d496f71d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191010024652_Initial.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20191018080830_Initial.cs @@ -324,7 +324,7 @@ namespace MyCompanyName.MyProjectName.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(maxLength: 5000, nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs index a785cd3b14..bea9ad3734 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs @@ -1215,7 +1215,7 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191010024800_Initial.Designer.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191010024800_Initial.Designer.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs index daa15fde16..3869a52615 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191010024800_Initial.Designer.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.Designer.cs @@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.Migrations { [DbContext(typeof(IdentityServerHostMigrationsDbContext))] - [Migration("20191010024800_Initial")] + [Migration("20191018080944_Initial")] partial class Initial { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -1131,7 +1131,7 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191010024800_Initial.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs similarity index 99% rename from templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191010024800_Initial.cs rename to templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs index e2410a1d55..cba4297cc9 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191010024800_Initial.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/20191018080944_Initial.cs @@ -288,7 +288,7 @@ namespace MyCompanyName.MyProjectName.Migrations ClientId = table.Column(maxLength: 200, nullable: false), CreationTime = table.Column(nullable: false), Expiration = table.Column(nullable: true), - Data = table.Column(maxLength: 5000, nullable: false) + Data = table.Column(maxLength: 50000, nullable: false) }, constraints: table => { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs index a140220ce0..e4036868a3 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/Migrations/IdentityServerHostMigrationsDbContextModelSnapshot.cs @@ -1129,7 +1129,7 @@ namespace MyCompanyName.MyProjectName.Migrations b.Property("Data") .IsRequired() .HasColumnType("nvarchar(max)") - .HasMaxLength(5000); + .HasMaxLength(50000); b.Property("Expiration") .HasColumnType("datetime2"); From 1f5756edbaac4a963f6ddc7b3da046e9aa9b998a Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Fri, 18 Oct 2019 11:33:43 +0300 Subject: [PATCH 72/96] update npm packs version to 0.9.2 --- npm/ng-packs/packages/account-config/package.json | 2 +- npm/ng-packs/packages/account/package.json | 6 +++--- npm/ng-packs/packages/core/package.json | 2 +- npm/ng-packs/packages/feature-management/package.json | 4 ++-- npm/ng-packs/packages/identity-config/package.json | 2 +- npm/ng-packs/packages/identity/package.json | 8 ++++---- npm/ng-packs/packages/permission-management/package.json | 4 ++-- .../packages/setting-management-config/package.json | 2 +- npm/ng-packs/packages/setting-management/package.json | 6 +++--- .../packages/tenant-management-config/package.json | 2 +- npm/ng-packs/packages/tenant-management/package.json | 8 ++++---- npm/ng-packs/packages/theme-basic/package.json | 4 ++-- npm/ng-packs/packages/theme-shared/package.json | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/npm/ng-packs/packages/account-config/package.json b/npm/ng-packs/packages/account-config/package.json index 7840234df1..ed997c9bb5 100644 --- a/npm/ng-packs/packages/account-config/package.json +++ b/npm/ng-packs/packages/account-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.account.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" } diff --git a/npm/ng-packs/packages/account/package.json b/npm/ng-packs/packages/account/package.json index 62808920ed..2e4385dd75 100644 --- a/npm/ng-packs/packages/account/package.json +++ b/npm/ng-packs/packages/account/package.json @@ -1,9 +1,9 @@ { "name": "@abp/ng.account", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", - "@abp/ng.account.config": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2", + "@abp/ng.account.config": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/core/package.json b/npm/ng-packs/packages/core/package.json index 4ff687cdeb..f747d9cbec 100644 --- a/npm/ng-packs/packages/core/package.json +++ b/npm/ng-packs/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.core", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { "@ngxs/router-plugin": "^3.5.0", "@ngxs/storage-plugin": "^3.5.0", diff --git a/npm/ng-packs/packages/feature-management/package.json b/npm/ng-packs/packages/feature-management/package.json index ea73b52529..8d8252e1d9 100644 --- a/npm/ng-packs/packages/feature-management/package.json +++ b/npm/ng-packs/packages/feature-management/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.feature-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/identity-config/package.json b/npm/ng-packs/packages/identity-config/package.json index 0c1bfcc821..512aad55a4 100644 --- a/npm/ng-packs/packages/identity-config/package.json +++ b/npm/ng-packs/packages/identity-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.identity.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" } diff --git a/npm/ng-packs/packages/identity/package.json b/npm/ng-packs/packages/identity/package.json index 3bee487918..fbf8f8764f 100644 --- a/npm/ng-packs/packages/identity/package.json +++ b/npm/ng-packs/packages/identity/package.json @@ -1,10 +1,10 @@ { "name": "@abp/ng.identity", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", - "@abp/ng.permission-management": "^0.9.1", - "@abp/ng.identity.config": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2", + "@abp/ng.permission-management": "^0.9.2", + "@abp/ng.identity.config": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/permission-management/package.json b/npm/ng-packs/packages/permission-management/package.json index 34b625a7ef..62d51a55bf 100644 --- a/npm/ng-packs/packages/permission-management/package.json +++ b/npm/ng-packs/packages/permission-management/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.permission-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/setting-management-config/package.json b/npm/ng-packs/packages/setting-management-config/package.json index f01d4d7004..0d9670de14 100644 --- a/npm/ng-packs/packages/setting-management-config/package.json +++ b/npm/ng-packs/packages/setting-management-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.setting-management.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" } diff --git a/npm/ng-packs/packages/setting-management/package.json b/npm/ng-packs/packages/setting-management/package.json index afb1e18be9..f5b533bb70 100644 --- a/npm/ng-packs/packages/setting-management/package.json +++ b/npm/ng-packs/packages/setting-management/package.json @@ -1,9 +1,9 @@ { "name": "@abp/ng.setting-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", - "@abp/ng.setting-management.config": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2", + "@abp/ng.setting-management.config": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/tenant-management-config/package.json b/npm/ng-packs/packages/tenant-management-config/package.json index 2c499447e2..d41cdc610e 100644 --- a/npm/ng-packs/packages/tenant-management-config/package.json +++ b/npm/ng-packs/packages/tenant-management-config/package.json @@ -1,6 +1,6 @@ { "name": "@abp/ng.tenant-management.config", - "version": "0.9.1", + "version": "0.9.2", "publishConfig": { "access": "public" } diff --git a/npm/ng-packs/packages/tenant-management/package.json b/npm/ng-packs/packages/tenant-management/package.json index d7f9b7cb63..62ba5b3ef3 100644 --- a/npm/ng-packs/packages/tenant-management/package.json +++ b/npm/ng-packs/packages/tenant-management/package.json @@ -1,10 +1,10 @@ { "name": "@abp/ng.tenant-management", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1", - "@abp/ng.feature-management": "^0.9.1", - "@abp/ng.tenant-management.config": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2", + "@abp/ng.feature-management": "^0.9.2", + "@abp/ng.tenant-management.config": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/theme-basic/package.json b/npm/ng-packs/packages/theme-basic/package.json index 95bfd226e9..6375803197 100644 --- a/npm/ng-packs/packages/theme-basic/package.json +++ b/npm/ng-packs/packages/theme-basic/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.theme.basic", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.theme.shared": "^0.9.1" + "@abp/ng.theme.shared": "^0.9.2" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 99b6872997..813efd2932 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -1,8 +1,8 @@ { "name": "@abp/ng.theme.shared", - "version": "0.9.1", + "version": "0.9.2", "dependencies": { - "@abp/ng.core": "^0.9.1", + "@abp/ng.core": "^0.9.2", "@angular/cdk": "^8.0.1", "@ng-bootstrap/ng-bootstrap": "^5.1.0", "@ngx-validate/core": "^0.0.7", From 81ce88ee203ae5d9b03842206d3d57caa1fef626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 12:36:18 +0300 Subject: [PATCH 73/96] Resolved #1094: Configuration redesign. --- ...bpAspNetCoreServiceCollectionExtensions.cs | 18 +------------ .../Abp/AspNetCore/AbpAspNetCoreModule.cs | 5 ---- .../AbpConfigurationBuilderOptions.cs | 5 ++++ .../Configuration/ConfigurationHelper.cs | 12 ++++++--- ...erviceCollectionConfigurationExtensions.cs | 13 ++++------ .../src/Volo.Abp.Core/Volo.Abp.Core.csproj | 1 + .../DefaultConfigurationAccessor.cs | 23 ---------------- .../Configuration/IConfigurationAccessor.cs | 11 -------- .../InternalServiceCollectionExtensions.cs | 15 ++++------- framework/test/SimpleConsoleDemo/Program.cs | 26 ++++++++++++++++--- .../SimpleConsoleDemo.csproj | 20 ++++++++++++-- .../test/SimpleConsoleDemo/appsettings.json | 3 +++ .../ConfigurationAccessor_Tests.cs | 7 +++-- 13 files changed, 73 insertions(+), 86 deletions(-) delete mode 100644 framework/src/Volo.Abp.Core/Volo/Abp/Configuration/DefaultConfigurationAccessor.cs delete mode 100644 framework/src/Volo.Abp.Core/Volo/Abp/Configuration/IConfigurationAccessor.cs create mode 100644 framework/test/SimpleConsoleDemo/appsettings.json diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs index ecb641df34..33e685ac4e 100644 --- a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs @@ -1,6 +1,4 @@ -using System; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; +using Microsoft.AspNetCore.Hosting; namespace Microsoft.Extensions.DependencyInjection { @@ -10,19 +8,5 @@ namespace Microsoft.Extensions.DependencyInjection { return services.GetSingletonInstance(); } - - [Obsolete] - public static IConfigurationRoot BuildConfiguration(this IServiceCollection services, AbpConfigurationBuilderOptions options = null) - { - return services.GetHostingEnvironment().BuildConfiguration(options); - } - - [Obsolete] - public static IConfigurationRoot AddConfiguration(this IServiceCollection services, AbpConfigurationBuilderOptions options = null) - { - var configuration = services.BuildConfiguration(options); - services.SetConfiguration(configuration); - return configuration; - } } } diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs index f7cc0710e7..298fffd20e 100644 --- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs +++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs @@ -29,11 +29,6 @@ namespace Volo.Abp.AspNetCore )] public class AbpAspNetCoreModule : AbpModule { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddConfiguration(); - } - public override void ConfigureServices(ServiceConfigurationContext context) { Configure(options => diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs index b9ca026791..93c9fe26c1 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/AbpConfigurationBuilderOptions.cs @@ -35,5 +35,10 @@ namespace Microsoft.Extensions.Configuration /// Prefix for the environment variables. /// public string EnvironmentVariablesPrefix { get; set; } + + /// + /// Command line arguments. + /// + public string[] CommandLineArgs { get; set; } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs index 6c0fe12b15..44b75d1adb 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/Configuration/ConfigurationHelper.cs @@ -5,7 +5,8 @@ namespace Microsoft.Extensions.Configuration { public static class ConfigurationHelper { - public static IConfigurationRoot BuildConfiguration(AbpConfigurationBuilderOptions options = null) + public static IConfigurationRoot BuildConfiguration( + AbpConfigurationBuilderOptions options = null) { options = options ?? new AbpConfigurationBuilderOptions(); @@ -22,8 +23,6 @@ namespace Microsoft.Extensions.Configuration { builder = builder.AddJsonFile($"{options.FileName}.{options.EnvironmentName}.json", optional: true, reloadOnChange: true); } - - builder = builder.AddEnvironmentVariables(options.EnvironmentVariablesPrefix); if (options.EnvironmentName == "Development") { @@ -37,6 +36,13 @@ namespace Microsoft.Extensions.Configuration } } + builder = builder.AddEnvironmentVariables(options.EnvironmentVariablesPrefix); + + if (options.CommandLineArgs != null) + { + builder = builder.AddCommandLine(options.CommandLineArgs); + } + return builder.Build(); } } diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs index 97a6ed4189..bcd3892e87 100644 --- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs +++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs @@ -1,20 +1,17 @@ -using System; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; -using Volo.Abp.Configuration; namespace Microsoft.Extensions.DependencyInjection { public static class ServiceCollectionConfigurationExtensions { - [Obsolete] - public static IServiceCollection SetConfiguration(this IServiceCollection services, IConfigurationRoot configurationRoot) + public static IServiceCollection ReplaceConfiguration(this IServiceCollection services, IConfiguration configuration) { - return services.Replace(ServiceDescriptor.Singleton(new DefaultConfigurationAccessor(configurationRoot))); + return services.Replace(ServiceDescriptor.Singleton(configuration)); } - public static IConfigurationRoot GetConfiguration(this IServiceCollection services) + public static IConfiguration GetConfiguration(this IServiceCollection services) { var hostBuilderContext = services.GetSingletonInstanceOrNull(); if (hostBuilderContext?.Configuration != null) @@ -22,7 +19,7 @@ namespace Microsoft.Extensions.DependencyInjection return hostBuilderContext.Configuration as IConfigurationRoot; } - return services.GetSingletonInstance().Configuration; + return services.GetSingletonInstance(); } } } diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj index 7d6562e478..475525c41d 100644 --- a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj +++ b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj @@ -17,6 +17,7 @@ + diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Configuration/DefaultConfigurationAccessor.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Configuration/DefaultConfigurationAccessor.cs deleted file mode 100644 index 318972f549..0000000000 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Configuration/DefaultConfigurationAccessor.cs +++ /dev/null @@ -1,23 +0,0 @@ -using Microsoft.Extensions.Configuration; - -namespace Volo.Abp.Configuration -{ - public class DefaultConfigurationAccessor : IConfigurationAccessor - { - public static DefaultConfigurationAccessor Empty { get; } - - public virtual IConfigurationRoot Configuration { get; } - - static DefaultConfigurationAccessor() - { - Empty = new DefaultConfigurationAccessor( - new ConfigurationBuilder().Build() - ); - } - - public DefaultConfigurationAccessor(IConfigurationRoot configuration) - { - Configuration = configuration; - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Configuration/IConfigurationAccessor.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Configuration/IConfigurationAccessor.cs deleted file mode 100644 index 34e5d96692..0000000000 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Configuration/IConfigurationAccessor.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using Microsoft.Extensions.Configuration; - -namespace Volo.Abp.Configuration -{ - [Obsolete("IConfigurationAccessor will be removed in v1.0. Use IConfiguration instead (be use that you are using generic host just like the startup templates).")] - public interface IConfigurationAccessor - { - IConfigurationRoot Configuration { get; } - } -} diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs index 7407f67bd6..83a7ec163e 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Volo.Abp.Configuration; using Volo.Abp.Modularity; using Volo.Abp.Reflection; @@ -24,17 +23,13 @@ namespace Volo.Abp.Internal var assemblyFinder = new AssemblyFinder(abpApplication); var typeFinder = new TypeFinder(assemblyFinder); - var configurationAccessor = new DefaultConfigurationAccessor( - ConfigurationHelper.BuildConfiguration( - applicationCreationOptions.Configuration - ) - ); - - services.TryAddSingleton(configurationAccessor); - if (!services.IsAdded()) { - services.AddSingleton(configurationAccessor.Configuration); + services.ReplaceConfiguration( + ConfigurationHelper.BuildConfiguration( + applicationCreationOptions.Configuration + ) + ); } services.TryAddSingleton(moduleLoader); diff --git a/framework/test/SimpleConsoleDemo/Program.cs b/framework/test/SimpleConsoleDemo/Program.cs index 08c6371bfb..82e6d0a660 100644 --- a/framework/test/SimpleConsoleDemo/Program.cs +++ b/framework/test/SimpleConsoleDemo/Program.cs @@ -1,4 +1,6 @@ using System; +using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp; using Volo.Abp.DependencyInjection; @@ -8,16 +10,31 @@ namespace SimpleConsoleDemo { class Program { - static void Main(string[] args) + static async Task Main(string[] args) { using (var application = AbpApplicationFactory.Create(options => { - + options.Configuration.CommandLineArgs = args; + options.UseAutofac(); })) { + Console.WriteLine("Initializing the application..."); application.Initialize(); + Console.WriteLine("Initializing the application... OK"); - Console.WriteLine("ABP initialized... Press ENTER to exit!"); + Console.WriteLine("Checking configuration..."); + + var configuration = application.ServiceProvider.GetRequiredService(); + if (configuration["AppSettingKey1"] != "AppSettingValue1") + { + Console.WriteLine("ERROR: Could not read the configuration!"); + Console.WriteLine("Press ENTER to exit!"); + Console.ReadLine(); + return; + } + + Console.WriteLine(); + Console.WriteLine("Checking configuration... OK"); var writers = application.ServiceProvider.GetServices(); foreach (var writer in writers) @@ -25,6 +42,9 @@ namespace SimpleConsoleDemo writer.Write(); } + + Console.WriteLine(); + Console.WriteLine("Press ENTER to exit!"); Console.ReadLine(); } } diff --git a/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj b/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj index 371e2374f9..6138532877 100644 --- a/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj +++ b/framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj @@ -1,4 +1,4 @@ - + Exe @@ -6,7 +6,23 @@ - + + + + + + PreserveNewest + true + PreserveNewest + + + + + + + + + diff --git a/framework/test/SimpleConsoleDemo/appsettings.json b/framework/test/SimpleConsoleDemo/appsettings.json new file mode 100644 index 0000000000..8a16cf34c3 --- /dev/null +++ b/framework/test/SimpleConsoleDemo/appsettings.json @@ -0,0 +1,3 @@ +{ + "AppSettingKey1": "AppSettingValue1" +} \ No newline at end of file diff --git a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Configuration/ConfigurationAccessor_Tests.cs b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Configuration/ConfigurationAccessor_Tests.cs index a69af199ff..3cb08d3924 100644 --- a/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Configuration/ConfigurationAccessor_Tests.cs +++ b/framework/test/Volo.Abp.Core.Tests/Volo/Abp/Configuration/ConfigurationAccessor_Tests.cs @@ -30,7 +30,7 @@ namespace Volo.Abp.Configuration using (var application = AbpApplicationFactory.Create()) { var myConfiguration = new ConfigurationBuilder().Build(); - application.Services.SetConfiguration(myConfiguration); + application.Services.ReplaceConfiguration(myConfiguration); application.Services.GetConfiguration().ShouldBe(myConfiguration); application.Initialize(); @@ -41,12 +41,11 @@ namespace Volo.Abp.Configuration } } - private static IConfigurationRoot ResolveConfiguration(IAbpApplication application) + private static IConfiguration ResolveConfiguration(IAbpApplication application) { return application .ServiceProvider - .GetRequiredService() - .Configuration; + .GetRequiredService(); } } } From 705407ba9f56effeb1ccf0890791602a79cab4ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 12:47:42 +0300 Subject: [PATCH 74/96] Merge AbpCacheOptions and AbpDistributedCacheOptions. Resolved #1901 --- .../Volo/Abp/Caching/AbpCacheOptions.cs | 32 ------------------- .../Volo/Abp/Caching/AbpCachingModule.cs | 2 +- .../Abp/Caching/AbpDistributedCacheOptions.cs | 29 ++++++++++++++++- .../Volo/Abp/Caching/DistributedCache.cs | 4 +-- .../Volo/Abp/Caching/AbpCachingTestModule.cs | 2 +- 5 files changed, 32 insertions(+), 37 deletions(-) delete mode 100644 framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCacheOptions.cs diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCacheOptions.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCacheOptions.cs deleted file mode 100644 index 09e319c551..0000000000 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCacheOptions.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Microsoft.Extensions.Caching.Distributed; -using System; -using System.Collections.Generic; - -namespace Volo.Abp.Caching -{ - public class AbpCacheOptions - { - /// - /// Cache key prefix. - /// - public string KeyPrefix { get; set; } - - /// - /// Global Cache entry options. - /// - public DistributedCacheEntryOptions GlobalCacheEntryOptions { get; set; } - - /// - /// List of all cache configurators. - /// (func argument:Name of cache) - /// - public List> CacheConfigurators { get; set; } //TODO list item use a configurator interface instead? - - public AbpCacheOptions() - { - CacheConfigurators = new List>(); - GlobalCacheEntryOptions = new DistributedCacheEntryOptions(); - KeyPrefix = ""; - } - } -} \ No newline at end of file diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs index 04a29d5fb2..2a44b1a91e 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpCachingModule.cs @@ -22,7 +22,7 @@ namespace Volo.Abp.Caching context.Services.AddSingleton(typeof(IDistributedCache<>), typeof(DistributedCache<>)); - context.Services.Configure(cacheOptions => + context.Services.Configure(cacheOptions => { cacheOptions.GlobalCacheEntryOptions.SlidingExpiration = TimeSpan.FromMinutes(20); }); diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs index 7f79d0f001..1ba432c959 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/AbpDistributedCacheOptions.cs @@ -1,4 +1,8 @@ -namespace Volo.Abp.Caching +using System; +using System.Collections.Generic; +using Microsoft.Extensions.Caching.Distributed; + +namespace Volo.Abp.Caching { public class AbpDistributedCacheOptions { @@ -6,5 +10,28 @@ /// Throw or hide exceptions for the distributed cache. /// public bool HideErrors { get; set; } = true; + + /// + /// Cache key prefix. + /// + public string KeyPrefix { get; set; } + + /// + /// Global Cache entry options. + /// + public DistributedCacheEntryOptions GlobalCacheEntryOptions { get; set; } + + /// + /// List of all cache configurators. + /// (func argument:Name of cache) + /// + public List> CacheConfigurators { get; set; } //TODO: use a configurator interface instead? + + public AbpDistributedCacheOptions() + { + CacheConfigurators = new List>(); + GlobalCacheEntryOptions = new DistributedCacheEntryOptions(); + KeyPrefix = ""; + } } } diff --git a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs index 990d4e4ef7..1e24a08196 100644 --- a/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs +++ b/framework/src/Volo.Abp.Caching/Volo/Abp/Caching/DistributedCache.cs @@ -36,12 +36,12 @@ namespace Volo.Abp.Caching protected DistributedCacheEntryOptions DefaultCacheOptions; - private readonly AbpCacheOptions _cacheOption; + private readonly AbpDistributedCacheOptions _cacheOption; private readonly AbpDistributedCacheOptions _distributedCacheOption; public DistributedCache( - IOptions cacheOption, + IOptions cacheOption, IOptions distributedCacheOption, IDistributedCache cache, ICancellationTokenProvider cancellationTokenProvider, diff --git a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs index 4202736b03..be003431f2 100644 --- a/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs +++ b/framework/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/AbpCachingTestModule.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Caching { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(option => + Configure(option => { option.CacheConfigurators.Add(cacheName => { From 4228ce096ee3d9ab063f3a9799e9137ae82f2556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 13:23:02 +0300 Subject: [PATCH 75/96] Remove usage of Volo.Abp.Configuration namespace. --- .../docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../ClientDemoService.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs | 1 - .../IdentityServer/IdentityServerDataSeedContributor.cs | 1 - .../ClientDemoService.cs | 1 - 11 files changed, 11 deletions(-) diff --git a/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs b/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs index 8ae314ab05..9c906767aa 100644 --- a/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs +++ b/modules/docs/app/VoloDocs.Web/Branding/VoloDocsBrandingProvider.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Components; -using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; using Volo.Docs.Localization; diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index e3b4ce770e..03d336f18e 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using IdentityServer4.Models; using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index e3b4ce770e..03d336f18e 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using IdentityServer4.Models; using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 73bd75a826..1f87857dcf 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index c931f18716..12b468de3f 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -6,7 +6,6 @@ using Acme.BookStore.BookManagement.Books; using Acme.BookStore.BookManagement.Samples; using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; -using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; using Volo.Abp.IdentityModel; diff --git a/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 77a77ba398..9a1e3aa468 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index 2cadd545db..dc948a8ac5 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using IdentityServer4.Models; using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs index e64ae510c5..b5c7ac27cf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using IdentityServer4.Models; using Microsoft.Extensions.Configuration; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index a45ebbe56a..dc8a39d222 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -25,7 +25,6 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.Autofac; using Volo.Abp.AutoMapper; -using Volo.Abp.Configuration; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity.Web; using Volo.Abp.Localization; diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 45c3c50340..593169ae48 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Configuration; using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs index ac7f4fc7df..7b88d85fc6 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/ClientDemoService.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using IdentityModel.Client; using Microsoft.Extensions.Configuration; using MyCompanyName.MyProjectName.Samples; -using Volo.Abp.Configuration; using Volo.Abp.DependencyInjection; using Volo.Abp.IdentityModel; From 3cc0e0f9c2307c0fece4d4ae5b125a97bf1ed8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yasin=20Ayd=C4=B1n?= Date: Fri, 18 Oct 2019 13:37:09 +0300 Subject: [PATCH 76/96] Feature/state services (#1939) * feat(core): add profile-state service * feat(core): add session-state service * feat(feature-management): add feature-management-state service * feat(identity): add identity-state service * feat(permission-management): add permission-management-state service * feat(tenant-management): add tenant-management-state service * feat(theme-basic): add layout-state service --- ...fig.service.ts => config-state.service.ts} | 2 +- .../packages/core/src/lib/services/index.ts | 4 +++- .../src/lib/services/profile-state.service.ts | 14 +++++++++++ .../src/lib/services/session-state.service.ts | 16 +++++++++++++ .../core/src/lib/states/profile.state.ts | 4 ++-- .../core/src/lib/tests/config.state.spec.ts | 8 +++---- .../core/src/lib/tests/profile.state.spec.ts | 4 ++-- .../feature-management-state.service.ts | 14 +++++++++++ .../src/lib/services/index.ts | 1 + .../lib/services/identity-state.service.ts | 23 +++++++++++++++++++ .../identity/src/lib/services/index.ts | 2 ++ .../src/lib/services/index.ts | 1 + .../permission-management-state.service.ts | 17 ++++++++++++++ .../src/lib/services/index.ts | 1 + .../tenant-management-state.service.ts | 18 +++++++++++++++ .../theme-basic/src/lib/services/index.ts | 2 ++ .../src/lib/services/layout-state.service.ts | 12 ++++++++++ 17 files changed, 133 insertions(+), 10 deletions(-) rename npm/ng-packs/packages/core/src/lib/services/{config.service.ts => config-state.service.ts} (94%) create mode 100644 npm/ng-packs/packages/core/src/lib/services/profile-state.service.ts create mode 100644 npm/ng-packs/packages/core/src/lib/services/session-state.service.ts create mode 100644 npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts create mode 100644 npm/ng-packs/packages/identity/src/lib/services/identity-state.service.ts create mode 100644 npm/ng-packs/packages/identity/src/lib/services/index.ts create mode 100644 npm/ng-packs/packages/permission-management/src/lib/services/permission-management-state.service.ts create mode 100644 npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts create mode 100644 npm/ng-packs/packages/theme-basic/src/lib/services/index.ts create mode 100644 npm/ng-packs/packages/theme-basic/src/lib/services/layout-state.service.ts diff --git a/npm/ng-packs/packages/core/src/lib/services/config.service.ts b/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts similarity index 94% rename from npm/ng-packs/packages/core/src/lib/services/config.service.ts rename to npm/ng-packs/packages/core/src/lib/services/config-state.service.ts index 21050f2b79..0efa55c179 100644 --- a/npm/ng-packs/packages/core/src/lib/services/config.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/config-state.service.ts @@ -5,7 +5,7 @@ import { ConfigState } from '../states'; @Injectable({ providedIn: 'root', }) -export class ConfigService { +export class ConfigStateService { constructor(private store: Store) {} getAll() { diff --git a/npm/ng-packs/packages/core/src/lib/services/index.ts b/npm/ng-packs/packages/core/src/lib/services/index.ts index 8ae05cabaa..6b90b997cc 100644 --- a/npm/ng-packs/packages/core/src/lib/services/index.ts +++ b/npm/ng-packs/packages/core/src/lib/services/index.ts @@ -1,6 +1,8 @@ export * from './application-configuration.service'; -export * from './config.service'; +export * from './config-state.service'; export * from './lazy-load.service'; export * from './localization.service'; export * from './profile.service'; export * from './rest.service'; +export * from './profile-state.service'; +export * from './session-state.service'; diff --git a/npm/ng-packs/packages/core/src/lib/services/profile-state.service.ts b/npm/ng-packs/packages/core/src/lib/services/profile-state.service.ts new file mode 100644 index 0000000000..7dea8de2ea --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/services/profile-state.service.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { ProfileState } from '../states'; + +@Injectable({ + providedIn: 'root', +}) +export class ProfileStateService { + constructor(private store: Store) {} + + getProfile() { + return this.store.selectSnapshot(ProfileState.getProfile); + } +} diff --git a/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts new file mode 100644 index 0000000000..03076e2eeb --- /dev/null +++ b/npm/ng-packs/packages/core/src/lib/services/session-state.service.ts @@ -0,0 +1,16 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { SessionState } from '../states'; + +@Injectable() +export class SessionStateService { + constructor(private store: Store) {} + + getLanguage() { + return this.store.selectSnapshot(SessionState.getLanguage); + } + + getTenant() { + return this.store.selectSnapshot(SessionState.getTenant); + } +} diff --git a/npm/ng-packs/packages/core/src/lib/states/profile.state.ts b/npm/ng-packs/packages/core/src/lib/states/profile.state.ts index cce9788f09..c19b120e1b 100644 --- a/npm/ng-packs/packages/core/src/lib/states/profile.state.ts +++ b/npm/ng-packs/packages/core/src/lib/states/profile.state.ts @@ -17,7 +17,7 @@ export class ProfileState { constructor(private profileService: ProfileService) {} @Action(GetProfile) - profileGet({ patchState }: StateContext) { + getProfile({ patchState }: StateContext) { return this.profileService.get().pipe( tap(profile => patchState({ @@ -28,7 +28,7 @@ export class ProfileState { } @Action(UpdateProfile) - profileUpdate({ patchState }: StateContext, { payload }: UpdateProfile) { + updateProfile({ patchState }: StateContext, { payload }: UpdateProfile) { return this.profileService.update(payload).pipe( tap(profile => patchState({ diff --git a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts index c01064152e..a7bae167b1 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/config.state.spec.ts @@ -2,7 +2,7 @@ import { createServiceFactory, SpectatorService, SpyObject } from '@ngneat/spect import { Store } from '@ngxs/store'; import { ReplaySubject, timer, Subject, of } from 'rxjs'; import { Config } from '../models/config'; -import { ApplicationConfigurationService, ConfigService } from '../services'; +import { ApplicationConfigurationService, ConfigStateService } from '../services'; import { ConfigState } from '../states'; import { SetLanguage, PatchRouteByName } from '../actions'; @@ -110,14 +110,14 @@ export const CONFIG_STATE_DATA = { } as Config.State; describe('ConfigState', () => { - let spectator: SpectatorService; + let spectator: SpectatorService; let store: SpyObject; - let service: ConfigService; + let service: ConfigStateService; let state: ConfigState; let appConfigService: SpyObject; const createService = createServiceFactory({ - service: ConfigService, + service: ConfigStateService, mocks: [ApplicationConfigurationService, Store], }); diff --git a/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts index 1ebdda217a..380ea53b1c 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/profile.state.spec.ts @@ -42,7 +42,7 @@ describe('ProfileState', () => { const spy = jest.spyOn(profileService, 'get'); spy.mockReturnValue(of(mockData as any)); - state.profileGet({ patchState } as any).subscribe(); + state.getProfile({ patchState } as any).subscribe(); expect(patchedData).toEqual({ profile: mockData }); }); @@ -54,7 +54,7 @@ describe('ProfileState', () => { const spy = jest.spyOn(profileService, 'update'); spy.mockReturnValue(of(mockData as any)); - state.profileUpdate({ patchState } as any, { payload: mockData as any }).subscribe(); + state.updateProfile({ patchState } as any, { payload: mockData as any }).subscribe(); expect(patchedData).toEqual({ profile: mockData }); }); diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts new file mode 100644 index 0000000000..a40d0f6186 --- /dev/null +++ b/npm/ng-packs/packages/feature-management/src/lib/services/feature-management-state.service.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { FeatureManagementState } from '../states'; + +@Injectable({ + providedIn: 'root', +}) +export class FeatureManagementStateService { + constructor(private store: Store) {} + + getFeatures() { + return this.store.selectSnapshot(FeatureManagementState.getFeatures); + } +} diff --git a/npm/ng-packs/packages/feature-management/src/lib/services/index.ts b/npm/ng-packs/packages/feature-management/src/lib/services/index.ts index 10fceceafe..1243410ea6 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/services/index.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/services/index.ts @@ -1 +1,2 @@ export * from './feature-management.service'; +export * from './feature-management-state.service'; diff --git a/npm/ng-packs/packages/identity/src/lib/services/identity-state.service.ts b/npm/ng-packs/packages/identity/src/lib/services/identity-state.service.ts new file mode 100644 index 0000000000..e5abe60fe9 --- /dev/null +++ b/npm/ng-packs/packages/identity/src/lib/services/identity-state.service.ts @@ -0,0 +1,23 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { IdentityState } from '../states/identity.state'; + +@Injectable({ + providedIn: 'root', +}) +export class IdentityStateService { + constructor(private store: Store) {} + + getRoles() { + return this.store.selectSnapshot(IdentityState.getRoles); + } + getRolesTotalCount() { + return this.store.selectSnapshot(IdentityState.getRolesTotalCount); + } + getUsers() { + return this.store.selectSnapshot(IdentityState.getUsers); + } + getUsersTotalCount() { + return this.store.selectSnapshot(IdentityState.getUsersTotalCount); + } +} diff --git a/npm/ng-packs/packages/identity/src/lib/services/index.ts b/npm/ng-packs/packages/identity/src/lib/services/index.ts new file mode 100644 index 0000000000..8f15a1ebe1 --- /dev/null +++ b/npm/ng-packs/packages/identity/src/lib/services/index.ts @@ -0,0 +1,2 @@ +export * from './identity.service'; +export * from './identity-state.service'; diff --git a/npm/ng-packs/packages/permission-management/src/lib/services/index.ts b/npm/ng-packs/packages/permission-management/src/lib/services/index.ts index 47ac05d8fa..8ac3c56f61 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/services/index.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/services/index.ts @@ -1 +1,2 @@ export * from './permission-management.service'; +export * from './permission-management-state.service'; diff --git a/npm/ng-packs/packages/permission-management/src/lib/services/permission-management-state.service.ts b/npm/ng-packs/packages/permission-management/src/lib/services/permission-management-state.service.ts new file mode 100644 index 0000000000..431b7be19f --- /dev/null +++ b/npm/ng-packs/packages/permission-management/src/lib/services/permission-management-state.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { PermissionManagementState } from '../states/permission-management.state'; + +@Injectable({ + providedIn: 'root', +}) +export class PermissionManagementStateService { + constructor(private store: Store) {} + + getPermissionGroups() { + return this.store.selectSnapshot(PermissionManagementState.getPermissionGroups); + } + getEntityDisplayName() { + return this.store.selectSnapshot(PermissionManagementState.getPermissionGroups); + } +} diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts index 25e55ae978..060dae4e0c 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/services/index.ts @@ -1 +1,2 @@ export * from './tenant-management.service'; +export * from './tenant-management-state.service'; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts new file mode 100644 index 0000000000..1b3200f155 --- /dev/null +++ b/npm/ng-packs/packages/tenant-management/src/lib/services/tenant-management-state.service.ts @@ -0,0 +1,18 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { TenantManagementState } from '../states/tenant-management.state'; + +@Injectable({ + providedIn: 'root', +}) +export class TenantManagementStateService { + constructor(private store: Store) {} + + getTenants() { + return this.store.selectSnapshot(TenantManagementState.get); + } + + getTenantsTotalCount() { + return this.store.selectSnapshot(TenantManagementState.getTenantsTotalCount); + } +} diff --git a/npm/ng-packs/packages/theme-basic/src/lib/services/index.ts b/npm/ng-packs/packages/theme-basic/src/lib/services/index.ts new file mode 100644 index 0000000000..b904c4d663 --- /dev/null +++ b/npm/ng-packs/packages/theme-basic/src/lib/services/index.ts @@ -0,0 +1,2 @@ +export * from './initial.service'; +export * from './layout-state.service'; diff --git a/npm/ng-packs/packages/theme-basic/src/lib/services/layout-state.service.ts b/npm/ng-packs/packages/theme-basic/src/lib/services/layout-state.service.ts new file mode 100644 index 0000000000..92ab3d0c59 --- /dev/null +++ b/npm/ng-packs/packages/theme-basic/src/lib/services/layout-state.service.ts @@ -0,0 +1,12 @@ +import { Injectable } from '@angular/core'; +import { Store } from '@ngxs/store'; +import { LayoutState } from '../states/layout.state'; + +@Injectable() +export class LayoutStateService { + constructor(private store: Store) {} + + getNavigationElements() { + return this.store.selectSnapshot(LayoutState.getNavigationElements); + } +} From 30c12e04a106f749afa859cbadab8af9b864cb17 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Oct 2019 13:40:48 +0300 Subject: [PATCH 77/96] chore: change peacock color --- npm/ng-packs/.vscode/settings.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/npm/ng-packs/.vscode/settings.json b/npm/ng-packs/.vscode/settings.json index ba819b4f57..0e7b4b1be1 100644 --- a/npm/ng-packs/.vscode/settings.json +++ b/npm/ng-packs/.vscode/settings.json @@ -5,18 +5,18 @@ "tslint.rulesDirectory": "../node_modules/codelyzer", "typescript.tsdk": "../node_modules/typescript/lib", "workbench.colorCustomizations": { - "activityBar.background": "#df7fa2", - "activityBar.foreground": "#15202b", - "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#c7ecb3", - "activityBarBadge.foreground": "#15202b", - "titleBar.activeBackground": "#d55685", - "titleBar.inactiveBackground": "#d5568599", - "titleBar.activeForeground": "#15202b", - "titleBar.inactiveForeground": "#15202b99", - "statusBar.background": "#d55685", - "statusBarItem.hoverBackground": "#c73169", - "statusBar.foreground": "#15202b" + "activityBar.background": "#90164b", + "activityBar.foreground": "#e7e7e7", + "activityBar.inactiveForeground": "#e7e7e799", + "activityBarBadge.background": "#0e1c04", + "activityBarBadge.foreground": "#e7e7e7", + "titleBar.activeBackground": "#640f34", + "titleBar.inactiveBackground": "#640f3499", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveForeground": "#e7e7e799", + "statusBar.background": "#640f34", + "statusBarItem.hoverBackground": "#90164b", + "statusBar.foreground": "#e7e7e7" }, - "peacock.color": "#d55685" + "peacock.color": "#640f34" } From c9d04e3a981b950d10dcbd6456017199199841d6 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 18 Oct 2019 14:11:52 +0300 Subject: [PATCH 78/96] font awesome upgraded to 5.11.2 --- npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | 2 +- npm/packs/font-awesome/abp.resourcemapping.js | 5 +++-- npm/packs/font-awesome/package.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index c2aeee5034..3476d246a3 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.2", + "version": "0.9.3", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "publishConfig": { "access": "public" diff --git a/npm/packs/font-awesome/abp.resourcemapping.js b/npm/packs/font-awesome/abp.resourcemapping.js index f0ed7da999..c78fcae429 100644 --- a/npm/packs/font-awesome/abp.resourcemapping.js +++ b/npm/packs/font-awesome/abp.resourcemapping.js @@ -1,6 +1,7 @@ module.exports = { mappings: { - "@node_modules/font-awesome/css/font-awesome.css": "@libs/font-awesome/css/", - "@node_modules/font-awesome/fonts/*.*": "@libs/font-awesome/fonts/" + "@node_modules/@fortawesome/fontawesome-free/css/all.css": "@libs/@fortawesome/fontawesome-free/css/", + "@node_modules/@fortawesome/fontawesome-free/css/v4-shims.css": "@libs/@fortawesome/fontawesome-free/css/", + "@node_modules/@fortawesome/fontawesome-free/webfonts/*.*": "@libs/@fortawesome/fontawesome-free/webfonts/" } } \ No newline at end of file diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index 177447237b..cccf4fa1f2 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,12 +1,12 @@ { - "version": "0.9.2", + "version": "0.9.3", "name": "@abp/font-awesome", "publishConfig": { "access": "public" }, "dependencies": { "@abp/core": "^0.9.2", - "font-awesome": "^4.7.0" + "@fortawesome/fontawesome-free": "^5.11.2" }, "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" } From 3610dd3bd78fa439e7e026c4d6cb9fc181f49b49 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 18 Oct 2019 14:12:39 +0300 Subject: [PATCH 79/96] Update package.json --- npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index 3476d246a3..b408f6b621 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -9,7 +9,7 @@ "@abp/bootstrap": "^0.9.2", "@abp/bootstrap-datepicker": "^0.9.2", "@abp/datatables.net-bs4": "^0.9.2", - "@abp/font-awesome": "^0.9.2", + "@abp/font-awesome": "^0.9.3", "@abp/jquery-form": "^0.9.2", "@abp/jquery-validation-unobtrusive": "^0.9.2", "@abp/lodash": "^0.9.2", From f2138e5868f322af421200542aef7f7b3b12c1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 14:19:03 +0300 Subject: [PATCH 80/96] Fix configuration usage. --- .../DemoAppHangfireModule.cs | 4 +--- .../MyProjectNameHttpApiHostModule.cs | 10 +++++----- .../MyProjectNameHttpApiHostModule.cs | 6 +++--- .../MyProjectNameIdentityServerModule.cs | 2 +- .../Menus/MyProjectNameMenuContributor.cs | 8 ++++---- .../MyProjectNameWebModule.cs | 12 ++++++------ .../MyProjectNameWebModule.cs | 4 ++-- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameWebHostModule.cs | 10 +++++----- 10 files changed, 29 insertions(+), 31 deletions(-) diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/DemoAppHangfireModule.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/DemoAppHangfireModule.cs index 1afe3f594c..ed3639bce0 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/DemoAppHangfireModule.cs +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.HangFire/DemoAppHangfireModule.cs @@ -4,7 +4,6 @@ using Volo.Abp.Autofac; using Volo.Abp.BackgroundJobs.DemoApp.Shared; using Volo.Abp.Modularity; using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; using Volo.Abp.BackgroundJobs.Hangfire; namespace Volo.Abp.BackgroundJobs.DemoApp.HangFire @@ -18,8 +17,7 @@ namespace Volo.Abp.BackgroundJobs.DemoApp.HangFire { public override void PreConfigureServices(ServiceConfigurationContext context) { - var configuration = ConfigurationHelper.BuildConfiguration(); - context.Services.SetConfiguration(configuration); + var configuration = context.Services.GetConfiguration(); context.Services.PreConfigure(hangfireConfiguration => { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index c89401b555..8056bf48f9 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -52,9 +52,9 @@ namespace MyCompanyName.MyProjectName ConfigureSwaggerServices(context); } - private void ConfigureCache(IConfigurationRoot configuration) + private void ConfigureCache(IConfiguration configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); @@ -84,7 +84,7 @@ namespace MyCompanyName.MyProjectName }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication("Bearer") .AddIdentityServerAuthentication(options => @@ -119,7 +119,7 @@ namespace MyCompanyName.MyProjectName private void ConfigureRedis( ServiceConfigurationContext context, - IConfigurationRoot configuration, + IConfiguration configuration, IWebHostEnvironment hostingEnvironment) { context.Services.AddStackExchangeRedisCache(options => @@ -136,7 +136,7 @@ namespace MyCompanyName.MyProjectName } } - private void ConfigureCors(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddCors(options => { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index 2b536acaaf..94781b5829 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -54,7 +54,7 @@ namespace MyCompanyName.MyProjectName ConfigureSwaggerServices(context); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -86,7 +86,7 @@ namespace MyCompanyName.MyProjectName }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication() .AddIdentityServerAuthentication(options => @@ -123,7 +123,7 @@ namespace MyCompanyName.MyProjectName }); } - private void ConfigureCors(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddCors(options => { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index b06ba2e16f..b848c88471 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -94,7 +94,7 @@ namespace MyCompanyName.MyProjectName options.IsJobExecutionEnabled = false; }); - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs index 6a8b55292c..f7ef2c2093 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Menus/MyProjectNameMenuContributor.cs @@ -13,11 +13,11 @@ namespace MyCompanyName.MyProjectName.Web.Menus { public class MyProjectNameMenuContributor : IMenuContributor { - private readonly IConfigurationRoot _configurationRoot; + private readonly IConfiguration _configuration; - public MyProjectNameMenuContributor(IConfigurationRoot configurationRoot) + public MyProjectNameMenuContributor(IConfiguration configuration) { - _configurationRoot = configurationRoot; + _configuration = configuration; } public async Task ConfigureMenuAsync(MenuConfigurationContext context) @@ -52,7 +52,7 @@ namespace MyCompanyName.MyProjectName.Web.Menus var l = context.ServiceProvider.GetRequiredService>(); var accountStringLocalizer = context.ServiceProvider.GetRequiredService>(); - var identityServerUrl = _configurationRoot["AuthServer:Authority"] ?? ""; + var identityServerUrl = _configuration["AuthServer:Authority"] ?? ""; context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["ManageYourProfile"], $"{identityServerUrl.EnsureEndsWith('/')}Account/Manage", icon: "fa fa-cog", order: 1000, null, "_blank")); context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000)); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 479c096487..28afed0c7c 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -81,15 +81,15 @@ namespace MyCompanyName.MyProjectName.Web ConfigureSwaggerServices(context.Services); } - private void ConfigureCache(IConfigurationRoot configuration) + private void ConfigureCache(IConfiguration configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -105,7 +105,7 @@ namespace MyCompanyName.MyProjectName.Web }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication(options => { @@ -167,7 +167,7 @@ namespace MyCompanyName.MyProjectName.Web } } - private void ConfigureNavigationServices(IConfigurationRoot configuration) + private void ConfigureNavigationServices(IConfiguration configuration) { Configure(options => { @@ -189,7 +189,7 @@ namespace MyCompanyName.MyProjectName.Web private void ConfigureRedis( ServiceConfigurationContext context, - IConfigurationRoot configuration, + IConfiguration configuration, IWebHostEnvironment hostingEnvironment) { context.Services.AddStackExchangeRedisCache(options => diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index dc8a39d222..3cfbabfd7d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -81,7 +81,7 @@ namespace MyCompanyName.MyProjectName.Web ConfigureSwaggerServices(context.Services); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -89,7 +89,7 @@ namespace MyCompanyName.MyProjectName.Web }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication() .AddIdentityServerAuthentication(options => diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index f114acb375..74edbc03a3 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -88,7 +88,7 @@ namespace MyCompanyName.MyProjectName options.ApiName = "MyProjectName"; }); - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index 59d4e7fd97..78b4739e8f 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -108,7 +108,7 @@ namespace MyCompanyName.MyProjectName options.ApiName = configuration["AuthServer:ApiName"]; }); - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index 5c6c97779f..7caa058c9a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -85,15 +85,15 @@ namespace MyCompanyName.MyProjectName ConfigureRedis(context, configuration, hostingEnvironment); } - private void ConfigureCache(IConfigurationRoot configuration) + private void ConfigureCache(IConfiguration configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "MyProjectName:"; }); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -109,7 +109,7 @@ namespace MyCompanyName.MyProjectName }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication(options => { @@ -186,7 +186,7 @@ namespace MyCompanyName.MyProjectName private void ConfigureRedis( ServiceConfigurationContext context, - IConfigurationRoot configuration, + IConfiguration configuration, IWebHostEnvironment hostingEnvironment) { context.Services.AddStackExchangeRedisCache(options => From 687748e4f45c3f229ea9f3ef7db989cf183e5dbb Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 18 Oct 2019 14:20:58 +0300 Subject: [PATCH 81/96] Update FontAwesomeStyleContributor.cs --- .../Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs index 7f01e15859..a3270f8d70 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs @@ -7,7 +7,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.FontAwesome { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.AddIfNotContains("/libs/font-awesome/css/font-awesome.css"); + context.Files.AddIfNotContains("/libs/@fortawesome/fontawesome-free/css/all.css"); + context.Files.AddIfNotContains("/libs/@fortawesome/fontawesome-free/css/v4-shims.css"); } } } \ No newline at end of file From 784eccbef6db2d8a844eb93af328080869cf4d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 14:27:59 +0300 Subject: [PATCH 82/96] Rollback version --- npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | 4 ++-- npm/packs/font-awesome/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json index b408f6b621..c2aeee5034 100644 --- a/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json +++ b/npm/packs/aspnetcore.mvc.ui.theme.shared/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.3", + "version": "0.9.2", "name": "@abp/aspnetcore.mvc.ui.theme.shared", "publishConfig": { "access": "public" @@ -9,7 +9,7 @@ "@abp/bootstrap": "^0.9.2", "@abp/bootstrap-datepicker": "^0.9.2", "@abp/datatables.net-bs4": "^0.9.2", - "@abp/font-awesome": "^0.9.3", + "@abp/font-awesome": "^0.9.2", "@abp/jquery-form": "^0.9.2", "@abp/jquery-validation-unobtrusive": "^0.9.2", "@abp/lodash": "^0.9.2", diff --git a/npm/packs/font-awesome/package.json b/npm/packs/font-awesome/package.json index cccf4fa1f2..3f77eaa28e 100644 --- a/npm/packs/font-awesome/package.json +++ b/npm/packs/font-awesome/package.json @@ -1,5 +1,5 @@ { - "version": "0.9.3", + "version": "0.9.2", "name": "@abp/font-awesome", "publishConfig": { "access": "public" From e76c92df4e7af127289b5448e79543f5b1b6dc5b Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Fri, 18 Oct 2019 15:29:28 +0300 Subject: [PATCH 83/96] Update BootstrapDatepickerScriptContributor.cs --- .../BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs index 241822facf..8de698c723 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago protected virtual bool TryAddCultureFile(BundleConfigurationContext context, string cultureName) { - var filePath = $"/libs/bootstrap-datepicker/locales/bootstrap-datepicker.{cultureName}.js"; + var filePath = $"/libs/bootstrap-datepicker/locales/bootstrap-datepicker.{cultureName}.min.js"; if (!context.FileProvider.GetFileInfo(filePath).Exists) { From 00a0dd58e033e2c625fe7367afea0bb39e227ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 15:51:44 +0300 Subject: [PATCH 84/96] Use the provider constant --- .../Abp/SettingManagement/SettingRepository_Tests.cs | 2 +- .../Abp/SettingManagement/SettingTestDataBuilder.cs | 6 +++--- .../SettingCacheItemInvalidator_Tests.cs | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingRepository_Tests.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingRepository_Tests.cs index ea52e4458c..5dad99a0ca 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingRepository_Tests.cs +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingRepository_Tests.cs @@ -30,7 +30,7 @@ namespace Volo.Abp.SettingManagement (await SettingRepository.FindAsync( "MySetting2", - "User", + UserSettingValueProvider.ProviderName, TestData.User1Id.ToString() )).Value.ShouldBe("user1-store-value"); diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs index a66a4fe253..6843d6257e 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.TestBase/Volo/Abp/SettingManagement/SettingTestDataBuilder.cs @@ -45,7 +45,7 @@ namespace Volo.Abp.SettingManagement _guidGenerator.Create(), "MySetting2", "user1-store-value", - "User", + UserSettingValueProvider.ProviderName, _testData.User1Id.ToString() ) ); @@ -55,7 +55,7 @@ namespace Volo.Abp.SettingManagement _guidGenerator.Create(), "MySetting2", "user2-store-value", - "User", + UserSettingValueProvider.ProviderName, _testData.User2Id.ToString() ) ); @@ -74,7 +74,7 @@ namespace Volo.Abp.SettingManagement _guidGenerator.Create(), "MySettingWithoutInherit", "user1-store-value", - "User", + UserSettingValueProvider.ProviderName, _testData.User1Id.ToString() ) ); diff --git a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingCacheItemInvalidator_Tests.cs b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingCacheItemInvalidator_Tests.cs index de956d0202..2a458a1739 100644 --- a/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingCacheItemInvalidator_Tests.cs +++ b/modules/setting-management/test/Volo.Abp.SettingManagement.Tests/Volo/Abp/SettingManagement/SettingCacheItemInvalidator_Tests.cs @@ -29,9 +29,9 @@ namespace Volo.Abp.SettingManagement public async Task GetOrNullAsync_Should_Cached() { // Act - (await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", "User", _testData.User1Id.ToString()))).ShouldBeNull(); - await _settingManagementStore.GetOrNullAsync("MySetting2", "User", _testData.User1Id.ToString()); - (await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", "User", _testData.User1Id.ToString()))).ShouldNotBeNull(); + (await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()))).ShouldBeNull(); + await _settingManagementStore.GetOrNullAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()); + (await _cache.GetAsync(SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()))).ShouldNotBeNull(); } [Fact] @@ -39,15 +39,15 @@ namespace Volo.Abp.SettingManagement { // Arrange // GetOrNullAsync will cache language. - await _settingManagementStore.GetOrNullAsync("MySetting2", "User", _testData.User1Id.ToString()); + await _settingManagementStore.GetOrNullAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()); // Act - var lang = await _settingRepository.FindAsync("MySetting2", "User", _testData.User1Id.ToString()); + var lang = await _settingRepository.FindAsync("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()); await _settingRepository.DeleteAsync(lang); // Assert (await _cache.GetAsync( - SettingCacheItem.CalculateCacheKey("MySetting2", "User", _testData.User1Id.ToString()))).ShouldBeNull(); + SettingCacheItem.CalculateCacheKey("MySetting2", UserSettingValueProvider.ProviderName, _testData.User1Id.ToString()))).ShouldBeNull(); } } } From c5a7fb3ee2b97a562d06c33b2fddbd892cceb6ab Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 18 Oct 2019 16:04:31 +0300 Subject: [PATCH 85/96] BackgroundJobs modules abp prefix --- .../app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs | 2 +- ...aredModule.cs => AbpBackgroundJobsDomainSharedModule.cs} | 2 +- ...JobsDomainModule.cs => AbpBackgroundJobsDomainModule.cs} | 6 +++--- .../Volo/Abp/BackgroundJobs/BackgroundJobStore.cs | 4 ++-- ...ule.cs => AbpBackgroundJobsEntityFrameworkCoreModule.cs} | 4 ++-- ...bsMongoDbModule.cs => AbpBackgroundJobsMongoDbModule.cs} | 4 ++-- ...inTestModule.cs => AbpBackgroundJobsDomainTestModule.cs} | 4 ++-- .../Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestBase.cs | 2 +- ...cs => AbpBackgroundJobsEntityFrameworkCoreTestModule.cs} | 6 +++--- .../EntityFrameworkCore/BackgroundJobRepositoryTests.cs | 2 +- ...bTestModule.cs => AbpBackgroundJobsMongoDbTestModule.cs} | 6 +++--- .../BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs | 2 +- ...TestBaseModule.cs => AbpBackgroundJobsTestBaseModule.cs} | 4 ++-- .../MyProjectNameDomainSharedModule.cs | 2 +- .../MyProjectNameDomainModule.cs | 2 +- .../MyProjectNameEntityFrameworkCoreModule.cs | 2 +- .../MongoDb/MyProjectNameMongoDbModule.cs | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) rename modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/{BackgroundJobsDomainSharedModule.cs => AbpBackgroundJobsDomainSharedModule.cs} (58%) rename modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/{BackgroundJobsDomainModule.cs => AbpBackgroundJobsDomainModule.cs} (69%) rename modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/{BackgroundJobsEntityFrameworkCoreModule.cs => AbpBackgroundJobsEntityFrameworkCoreModule.cs} (82%) rename modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/{BackgroundJobsMongoDbModule.cs => AbpBackgroundJobsMongoDbModule.cs} (83%) rename modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/{BackgroundJobsDomainTestModule.cs => AbpBackgroundJobsDomainTestModule.cs} (57%) rename modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/{BackgroundJobsEntityFrameworkCoreTestModule.cs => AbpBackgroundJobsEntityFrameworkCoreTestModule.cs} (87%) rename modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/{BackgroundJobsMongoDbTestModule.cs => AbpBackgroundJobsMongoDbTestModule.cs} (82%) rename modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/{BackgroundJobsTestBaseModule.cs => AbpBackgroundJobsTestBaseModule.cs} (90%) diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs index 5308053e83..f64191ea3f 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp/DemoAppModule.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.BackgroundJobs.DemoApp { [DependsOn( typeof(DemoAppSharedModule), - typeof(BackgroundJobsEntityFrameworkCoreModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule), typeof(AbpAutofacModule), typeof(AbpEntityFrameworkCoreSqlServerModule) )] diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/BackgroundJobsDomainSharedModule.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainSharedModule.cs similarity index 58% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/BackgroundJobsDomainSharedModule.cs rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainSharedModule.cs index 2012620f3a..26565fde78 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/BackgroundJobsDomainSharedModule.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain.Shared/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainSharedModule.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.BackgroundJobs { - public class BackgroundJobsDomainSharedModule : AbpModule + public class AbpBackgroundJobsDomainSharedModule : AbpModule { } diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDomainModule.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainModule.cs similarity index 69% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDomainModule.cs rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainModule.cs index 261051958c..a373fd883b 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobsDomainModule.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainModule.cs @@ -5,15 +5,15 @@ using Volo.Abp.Modularity; namespace Volo.Abp.BackgroundJobs { [DependsOn( - typeof(BackgroundJobsDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), typeof(AbpBackgroundJobsModule), typeof(AbpAutoMapperModule) )] - public class BackgroundJobsDomainModule : AbpModule //TODO: Rename to AbpBackgroundJobsDomainModule + public class AbpBackgroundJobsDomainModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { - context.Services.AddAutoMapperObjectMapper(); + context.Services.AddAutoMapperObjectMapper(); Configure(options => { options.AddProfile(validate: true); diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs index dce8a31600..2b796d9eaf 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobStore.cs @@ -10,11 +10,11 @@ namespace Volo.Abp.BackgroundJobs { protected IBackgroundJobRepository BackgroundJobRepository { get; } - protected IObjectMapper ObjectMapper { get; } + protected IObjectMapper ObjectMapper { get; } public BackgroundJobStore( IBackgroundJobRepository backgroundJobRepository, - IObjectMapper objectMapper) + IObjectMapper objectMapper) { ObjectMapper = objectMapper; BackgroundJobRepository = backgroundJobRepository; diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreModule.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreModule.cs similarity index 82% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreModule.cs rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreModule.cs index 9661dd7646..1c4e6278a5 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreModule.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreModule.cs @@ -5,10 +5,10 @@ using Volo.Abp.Modularity; namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore { [DependsOn( - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpEntityFrameworkCoreModule) )] - public class BackgroundJobsEntityFrameworkCoreModule : AbpModule + public class AbpBackgroundJobsEntityFrameworkCoreModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbModule.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbModule.cs similarity index 83% rename from modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbModule.cs rename to modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbModule.cs index 6ace195fa5..3e98ea6bc2 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbModule.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbModule.cs @@ -5,10 +5,10 @@ using Volo.Abp.MongoDB; namespace Volo.Abp.BackgroundJobs.MongoDB { [DependsOn( - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpMongoDbModule) )] - public class BackgroundJobsMongoDbModule : AbpModule + public class AbpBackgroundJobsMongoDbModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainTestModule.cs similarity index 57% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestModule.cs rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainTestModule.cs index d4c861b24c..a9a4bff069 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/AbpBackgroundJobsDomainTestModule.cs @@ -4,9 +4,9 @@ using Volo.Abp.Modularity; namespace Volo.Abp.BackgroundJobs { [DependsOn( - typeof(BackgroundJobsEntityFrameworkCoreTestModule) + typeof(AbpBackgroundJobsEntityFrameworkCoreTestModule) )] - public class BackgroundJobsDomainTestModule : AbpModule + public class AbpBackgroundJobsDomainTestModule : AbpModule { } diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestBase.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestBase.cs index 259fbf1929..ae1a2064d3 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestBase.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.Domain.Tests/Volo/Abp/BackgroundJobs/BackgroundJobsDomainTestBase.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.BackgroundJobs { - public abstract class BackgroundJobsDomainTestBase : BackgroundJobsTestBase + public abstract class BackgroundJobsDomainTestBase : BackgroundJobsTestBase { } diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreTestModule.cs similarity index 87% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreTestModule.cs rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreTestModule.cs index 70318c1e7a..65ed1194cf 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobsEntityFrameworkCoreTestModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/AbpBackgroundJobsEntityFrameworkCoreTestModule.cs @@ -9,10 +9,10 @@ using Volo.Abp.Modularity; namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore { [DependsOn( - typeof(BackgroundJobsTestBaseModule), - typeof(BackgroundJobsEntityFrameworkCoreModule) + typeof(AbpBackgroundJobsTestBaseModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule) )] - public class BackgroundJobsEntityFrameworkCoreTestModule : AbpModule + public class AbpBackgroundJobsEntityFrameworkCoreTestModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobRepositoryTests.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobRepositoryTests.cs index e2f4f22476..42c412037e 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobRepositoryTests.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.EntityFrameworkCore.Tests/Volo/Abp/BackgroundJobs/EntityFrameworkCore/BackgroundJobRepositoryTests.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore { - public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests + public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests { } diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs similarity index 82% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs index e8eba4eb12..4147917829 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/AbpBackgroundJobsMongoDbTestModule.cs @@ -7,10 +7,10 @@ using Volo.Abp.Modularity; namespace Volo.Abp.BackgroundJobs.MongoDB { [DependsOn( - typeof(BackgroundJobsTestBaseModule), - typeof(BackgroundJobsMongoDbModule) + typeof(AbpBackgroundJobsTestBaseModule), + typeof(AbpBackgroundJobsMongoDbModule) )] - public class BackgroundJobsMongoDbTestModule : AbpModule + public class AbpBackgroundJobsMongoDbTestModule : AbpModule { private static readonly MongoDbRunner MongoDbRunner = MongoDbRunner.Start(); diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs index c6106e777a..429cf4821f 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobRepositoryTests.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.BackgroundJobs.MongoDB { - public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests + public class BackgroundJobRepositoryTests : BackgroundJobRepository_Tests { } diff --git a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/AbpBackgroundJobsTestBaseModule.cs similarity index 90% rename from modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs rename to modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/AbpBackgroundJobsTestBaseModule.cs index 5af07bd6dc..0c1a681eeb 100644 --- a/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/BackgroundJobsTestBaseModule.cs +++ b/modules/background-jobs/test/Volo.Abp.BackgroundJobs.TestBase/Volo/Abp/BackgroundJobs/AbpBackgroundJobsTestBaseModule.cs @@ -7,9 +7,9 @@ namespace Volo.Abp.BackgroundJobs [DependsOn( typeof(AbpAutofacModule), typeof(AbpTestBaseModule), - typeof(BackgroundJobsDomainModule) + typeof(AbpBackgroundJobsDomainModule) )] - public class BackgroundJobsTestBaseModule : AbpModule + public class AbpBackgroundJobsTestBaseModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index cb1f23151e..38e95a5d4b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -16,7 +16,7 @@ namespace MyCompanyName.MyProjectName { [DependsOn( typeof(AbpAuditLoggingDomainSharedModule), - typeof(BackgroundJobsDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpIdentityDomainSharedModule), typeof(AbpIdentityServerDomainSharedModule), diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs index 01d68fa87a..26e2639524 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs @@ -16,7 +16,7 @@ namespace MyCompanyName.MyProjectName [DependsOn( typeof(MyProjectNameDomainSharedModule), typeof(AbpAuditLoggingDomainModule), - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpFeatureManagementDomainModule), typeof(AbpIdentityDomainModule), typeof(AbpPermissionManagementDomainIdentityModule), diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs index 57e0d532fe..9d2f167136 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEntityFrameworkCoreModule.cs @@ -20,7 +20,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(BackgroundJobsEntityFrameworkCoreModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbModule.cs index 4b450dd3e0..5d3bfabab5 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDb/MyProjectNameMongoDbModule.cs @@ -17,7 +17,7 @@ namespace MyCompanyName.MyProjectName.MongoDB typeof(AbpSettingManagementMongoDbModule), typeof(AbpIdentityMongoDbModule), typeof(AbpIdentityServerMongoDbModule), - typeof(BackgroundJobsMongoDbModule), + typeof(AbpBackgroundJobsMongoDbModule), typeof(AbpAuditLoggingMongoDbModule), typeof(AbpTenantManagementMongoDbModule), typeof(AbpFeatureManagementMongoDbModule) From e4957fe45548b7910996aab2dc6b0f9f425e7c04 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Oct 2019 16:08:24 +0300 Subject: [PATCH 86/96] feat: upgrade font awesome --- npm/ng-packs/angular.json | 9 ++++++-- .../apps/dev-app/src/app/app.component.ts | 8 ++++++- .../dev-app/src/app/home/home.component.html | 2 +- npm/ng-packs/package.json | 21 ++++++++++--------- .../packages/theme-shared/ng-package.json | 1 + .../packages/theme-shared/package.json | 3 ++- .../lib/components/button/button.component.ts | 2 +- templates/app/angular/angular.json | 9 ++++++-- .../app/angular/src/app/app.component.ts | 8 ++++++- .../angular/src/app/home/home.component.html | 2 +- 10 files changed, 45 insertions(+), 20 deletions(-) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index f1c7d18a46..cfa01cf43f 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -435,9 +435,14 @@ "apps/dev-app/src/styles.scss", "node_modules/bootstrap/dist/css/bootstrap.min.css", { - "input": "node_modules/font-awesome/css/font-awesome.min.css", + "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "lazy": true, - "bundleName": "font-awesome.min" + "bundleName": "fontawesome-all.min" + }, + { + "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css", + "lazy": true, + "bundleName": "fontawesome-v4-shims.min" }, { "input": "node_modules/primeng/resources/themes/nova-light/theme.css", diff --git a/npm/ng-packs/apps/dev-app/src/app/app.component.ts b/npm/ng-packs/apps/dev-app/src/app/app.component.ts index e89c73184d..4780afbfd5 100644 --- a/npm/ng-packs/apps/dev-app/src/app/app.component.ts +++ b/npm/ng-packs/apps/dev-app/src/app/app.component.ts @@ -14,7 +14,13 @@ export class AppComponent implements OnInit { ngOnInit() { this.lazyLoadService .load( - ['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'], + [ + 'primeng.min.css', + 'primeicons.css', + 'primeng-nova-light-theme.css', + 'fontawesome-all.min.css', + 'fontawesome-v4-shims.min.css', + ], 'style', null, 'head', diff --git a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html index 4fafc67398..79220d16c4 100644 --- a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html +++ b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html @@ -6,7 +6,7 @@

{{ 'AbpIdentity::Login' | abpLocalization }}{{ 'AbpIdentity::Login' | abpLocalization }}

diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 3774a5705d..abee172af0 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -7,13 +7,17 @@ "abpng": "abpng", "commit": "git-cz && node scripts/push.js", "lint": "ng lint --fix", - "build:scripts": "cd scripts && npm install && npm run build" + "scripts:build": "cd scripts && npm install && npm run build" }, "devDependencies": { - "@abp/ng.core": "^0.9.0", - "@abp/ng.feature-management": "^0.9.0", - "@abp/ng.permission-management": "^0.9.0", - "@abp/ng.theme.shared": "^0.9.0", + "@abp/ng.account.config": "0.9.2", + "@abp/ng.core": "0.9.2", + "@abp/ng.feature-management": "0.9.2", + "@abp/ng.identity.config": "0.9.2", + "@abp/ng.permission-management": "0.9.2", + "@abp/ng.setting-management.config": "0.9.2", + "@abp/ng.tenant-management.config": "0.9.2", + "@abp/ng.theme.shared": "0.9.2", "@angular-builders/jest": "^8.2.0", "@angular-devkit/build-angular": "~0.803.6", "@angular-devkit/build-ng-packagr": "~0.803.6", @@ -29,6 +33,7 @@ "@angular/platform-browser": "~8.2.8", "@angular/platform-browser-dynamic": "~8.2.8", "@angular/router": "~8.1.2", + "@fortawesome/fontawesome-free": "^5.11.2", "@ng-bootstrap/ng-bootstrap": "^5.1.0", "@ngneat/spectator": "^4.4.0", "@ngx-validate/core": "^0.0.7", @@ -64,11 +69,7 @@ "tsickle": "^0.37.0", "tslint": "~5.20.0", "typescript": "~3.5.3", - "zone.js": "~0.9.1", - "@abp/ng.account.config": "^0.9.0", - "@abp/ng.identity.config": "0.9.0", - "@abp/ng.tenant-management.config": "^0.9.0", - "@abp/ng.setting-management.config": "^0.9.0" + "zone.js": "~0.9.1" }, "dependencies": { "tslib": "^1.10.0" diff --git a/npm/ng-packs/packages/theme-shared/ng-package.json b/npm/ng-packs/packages/theme-shared/ng-package.json index 984eb7c61a..a879347afd 100644 --- a/npm/ng-packs/packages/theme-shared/ng-package.json +++ b/npm/ng-packs/packages/theme-shared/ng-package.json @@ -7,6 +7,7 @@ "whitelistedNonPeerDependencies": [ "@abp/ng.core", "@angular/cdk", + "@fortawesome/fontawesome-free", "@ng-bootstrap/ng-bootstrap", "@ngx-validate/core", "bootstrap", diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json index 813efd2932..0480977d6f 100644 --- a/npm/ng-packs/packages/theme-shared/package.json +++ b/npm/ng-packs/packages/theme-shared/package.json @@ -4,6 +4,7 @@ "dependencies": { "@abp/ng.core": "^0.9.2", "@angular/cdk": "^8.0.1", + "@fortawesome/fontawesome-free": "5.10.1", "@ng-bootstrap/ng-bootstrap": "^5.1.0", "@ngx-validate/core": "^0.0.7", "bootstrap": "^4.3.1", @@ -11,7 +12,7 @@ "font-awesome": "^4.7.0", "ngx-perfect-scrollbar": "^8.0.0", "primeicons": "^2.0.0", - "primeng": "^8.0.3" + "primeng": "^8.0.4" }, "publishConfig": { "access": "public" diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts index 99d58d3124..569484867b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts @@ -55,7 +55,7 @@ export class ButtonComponent implements OnInit { @Input() type = 'button'; get icon(): string { - return `${this.loading ? 'fa fa-pulse fa-spinner' : this.iconClass || 'd-none'}`; + return `${this.loading ? 'fa fa-spinner fa-spin' : this.iconClass || 'd-none'}`; } constructor(private renderer: Renderer2) {} diff --git a/templates/app/angular/angular.json b/templates/app/angular/angular.json index f7bb4656fe..4b1f31497b 100644 --- a/templates/app/angular/angular.json +++ b/templates/app/angular/angular.json @@ -29,9 +29,14 @@ "src/styles.scss", "node_modules/bootstrap/dist/css/bootstrap.min.css", { - "input": "node_modules/font-awesome/css/font-awesome.min.css", + "input": "node_modules/@fortawesome/fontawesome-free/css/all.min.css", "lazy": true, - "bundleName": "font-awesome.min" + "bundleName": "fontawesome-all.min" + }, + { + "input": "node_modules/@fortawesome/fontawesome-free/css/v4-shims.min.css", + "lazy": true, + "bundleName": "fontawesome-v4-shims.min" }, { "input": "node_modules/primeng/resources/themes/nova-light/theme.css", diff --git a/templates/app/angular/src/app/app.component.ts b/templates/app/angular/src/app/app.component.ts index e89c73184d..4780afbfd5 100644 --- a/templates/app/angular/src/app/app.component.ts +++ b/templates/app/angular/src/app/app.component.ts @@ -14,7 +14,13 @@ export class AppComponent implements OnInit { ngOnInit() { this.lazyLoadService .load( - ['primeng.min.css', 'primeicons.css', 'primeng-nova-light-theme.css', 'font-awesome.min.css'], + [ + 'primeng.min.css', + 'primeicons.css', + 'primeng-nova-light-theme.css', + 'fontawesome-all.min.css', + 'fontawesome-v4-shims.min.css', + ], 'style', null, 'head', diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html index 4fafc67398..79220d16c4 100644 --- a/templates/app/angular/src/app/home/home.component.html +++ b/templates/app/angular/src/app/home/home.component.html @@ -6,7 +6,7 @@

{{ 'AbpIdentity::Login' | abpLocalization }}{{ 'AbpIdentity::Login' | abpLocalization }}

From 6a575eab23256f20c4603feac013e487d2bbcf5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 18 Oct 2019 16:24:59 +0300 Subject: [PATCH 87/96] Use AbpMultiTenancyOptions --- .../Themes/Basic/Layouts/Account.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml index 7e855834da..7b43c6d969 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml @@ -14,7 +14,7 @@ @using Volo.Abp.MultiTenancy @inject IAbpAntiForgeryManager AbpAntiForgeryManager @inject IBrandingProvider BrandingProvider -@inject IOptions MultiTenancyOptions +@inject IOptions MultiTenancyOptions @inject ICurrentTenant CurrentTenant @inject IStringLocalizer MultiTenancyStringLocalizer @inject ITenantResolveResultAccessor TenantResolveResultAccessor From e1828614702d646feab3e4d73696d894d63bbc55 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Oct 2019 17:14:39 +0300 Subject: [PATCH 88/96] fix: table columns --- .../identity/src/lib/components/roles/roles.component.html | 6 +++--- .../identity/src/lib/components/users/users.component.html | 6 +++--- .../src/lib/components/tenants/tenants.component.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index 822c5a9576..4de916e77b 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -23,7 +23,7 @@ /> - + @@ -65,7 +65,7 @@ - +
- + @@ -76,7 +76,7 @@ - +
- + @@ -68,7 +68,7 @@ - +