diff --git a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs index 160e66f49f..acd4233512 100644 --- a/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Microsoft/Extensions/DependencyInjection/AbpOpenIdConnectExtensions.cs @@ -53,7 +53,7 @@ namespace Microsoft.Extensions.DependencyInjection private static void SetAbpTenantId(AuthorizationCodeReceivedContext receivedContext) { var tenantKey = receivedContext.HttpContext.RequestServices - .GetRequiredService>().Value.TenantKey; + .GetRequiredService>().Value.TenantKey; if (receivedContext.Request.Cookies.ContainsKey(tenantKey)) { 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 e57d847a26..701833bc70 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 @@ -8,7 +8,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { 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/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAntiForgeryCookieNameProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAntiForgeryCookieNameProvider.cs index 66cd8701de..73b31bf960 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAntiForgeryCookieNameProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AntiForgery/AbpAntiForgeryCookieNameProvider.cs @@ -6,11 +6,11 @@ namespace Volo.Abp.AspNetCore.Mvc.AntiForgery { public class AbpAntiForgeryCookieNameProvider : ITransientDependency { - private readonly IOptionsSnapshot _namedOptionsAccessor; + private readonly IOptionsMonitor _namedOptionsAccessor; private readonly AbpAntiForgeryOptions _abpAntiForgeryOptions; public AbpAntiForgeryCookieNameProvider( - IOptionsSnapshot namedOptionsAccessor, + IOptionsMonitor namedOptionsAccessor, IOptions abpAntiForgeryOptions) { _namedOptionsAccessor = namedOptionsAccessor; 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 f907cb0cb6..5d9dd20298 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.Data protected AbpDbConnectionOptions Options { get; } public DefaultConnectionStringResolver( - IOptionsSnapshot options) + IOptionsMonitor options) { - Options = options.Value; + Options = options.CurrentValue; } [Obsolete("Use ResolveAsync method.")] @@ -32,9 +32,9 @@ namespace Volo.Abp.Data { return Options.ConnectionStrings.Default; } - + var connectionString = Options.GetConnectionStringOrNull(connectionStringName); - + if (!connectionString.IsNullOrEmpty()) { return connectionString; @@ -43,4 +43,4 @@ namespace Volo.Abp.Data return null; } } -} \ No newline at end of file +} diff --git a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceConfigurationProvider.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceConfigurationProvider.cs index c14ea40aa3..be2cadf62a 100644 --- a/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceConfigurationProvider.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/RemoteServiceConfigurationProvider.cs @@ -8,9 +8,9 @@ namespace Volo.Abp.Http.Client { protected AbpRemoteServiceOptions Options { get; } - public RemoteServiceConfigurationProvider(IOptionsSnapshot options) + public RemoteServiceConfigurationProvider(IOptionsMonitor options) { - Options = options.Value; + Options = options.CurrentValue; } public Task GetConfigurationOrDefaultAsync(string name) @@ -23,4 +23,4 @@ namespace Volo.Abp.Http.Client return Task.FromResult(Options.RemoteServices.GetConfigurationOrDefaultOrNull(name)); } } -} \ No newline at end of file +} 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 ebdbe2a280..3c07766f0f 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 @@ -11,9 +11,9 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore { private readonly AbpDefaultTenantStoreOptions _options; - public DefaultTenantStore(IOptionsSnapshot options) + public DefaultTenantStore(IOptionsMonitor options) { - _options = options.Value; + _options = options.CurrentValue; } public Task FindAsync(string name) @@ -36,4 +36,4 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore return _options.Tenants?.FirstOrDefault(t => t.Id == id); } } -} \ No newline at end of file +} 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 631646eaca..b24d2ffeb9 100644 --- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs +++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs @@ -15,7 +15,7 @@ namespace Volo.Abp.MultiTenancy private readonly IServiceProvider _serviceProvider; public MultiTenantConnectionStringResolver( - IOptionsSnapshot options, + IOptionsMonitor options, ICurrentTenant currentTenant, IServiceProvider serviceProvider) : base(options) diff --git a/framework/src/Volo.Abp.Sms.Aliyun/Volo/Abp/Sms/Aliyun/AliyunSmsSender.cs b/framework/src/Volo.Abp.Sms.Aliyun/Volo/Abp/Sms/Aliyun/AliyunSmsSender.cs index bb4d6282cb..6bf448ac0b 100644 --- a/framework/src/Volo.Abp.Sms.Aliyun/Volo/Abp/Sms/Aliyun/AliyunSmsSender.cs +++ b/framework/src/Volo.Abp.Sms.Aliyun/Volo/Abp/Sms/Aliyun/AliyunSmsSender.cs @@ -12,9 +12,9 @@ namespace Volo.Abp.Sms.Aliyun { protected AbpAliyunSmsOptions Options { get; } - public AliyunSmsSender(IOptionsSnapshot options) + public AliyunSmsSender(IOptionsMonitor options) { - Options = options.Value; + Options = options.CurrentValue; } public async Task SendAsync(SmsMessage smsMessage) @@ -40,4 +40,4 @@ namespace Volo.Abp.Sms.Aliyun }); } } -} \ No newline at end of file +}