From b525696b037637865275da72ad7f88053b4cc4fd Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Tue, 24 May 2022 18:41:28 +0300 Subject: [PATCH] fix usings --- common/ASC.Common/Caching/AscCache.cs | 1 - common/ASC.Common/GlobalUsings.cs | 4 +- .../Encryption/EncryptionSettings.cs | 2 - common/ASC.Core.Common/GlobalUsings.cs | 11 ++-- ...vokeSendMethodRequestedIntegrationEvent.cs | 3 -- ...ifySendMessageRequestedIntegrationEvent.cs | 3 -- ...elegramMessageRequestedIntegrationEvent.cs | 3 -- .../Notify/Messages/NotifyInvoke.cs | 2 - .../Notify/Messages/NotifyMessage.cs | 2 - .../Messages/NotifyMessageAttachment.cs | 2 - ...StorageRequestedIntegrationEventHandler.cs | 12 +---- ...cryptionDataStorageRequestedIntegration.cs | 5 -- common/ASC.Data.Storage/GlobalUsings.cs | 22 ++++---- .../GlobalUsings.cs | 8 +-- common/services/ASC.Notify/GlobalUsings.cs | 19 +++---- .../ASC.TelegramService/GlobalUsings.cs | 19 +++---- ...MessageRequestedIntegrationEventHandler.cs | 2 - .../ASC.TelegramService/TelegramHandler.cs | 51 +++++++++++++------ products/ASC.Files/Core/GlobalUsings.cs | 7 +-- 19 files changed, 80 insertions(+), 98 deletions(-) diff --git a/common/ASC.Common/Caching/AscCache.cs b/common/ASC.Common/Caching/AscCache.cs index 1c14d90972..205298b43a 100644 --- a/common/ASC.Common/Caching/AscCache.cs +++ b/common/ASC.Common/Caching/AscCache.cs @@ -24,7 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using Microsoft.Extensions.Primitives; namespace ASC.Common.Caching; diff --git a/common/ASC.Common/GlobalUsings.cs b/common/ASC.Common/GlobalUsings.cs index 2068c46a73..e45722f60e 100644 --- a/common/ASC.Common/GlobalUsings.cs +++ b/common/ASC.Common/GlobalUsings.cs @@ -32,7 +32,6 @@ global using System.Globalization; global using System.Net; global using System.Net.Mail; global using System.Reflection; -global using System.Runtime.Caching; global using System.Runtime.CompilerServices; global using System.Runtime.Loader; global using System.Runtime.Serialization; @@ -89,6 +88,7 @@ global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.DependencyInjection.Extensions; global using Microsoft.Extensions.Logging; global using Microsoft.Extensions.Options; +global using Microsoft.Extensions.Primitives; global using Microsoft.Net.Http.Headers; global using Newtonsoft.Json; @@ -105,4 +105,4 @@ global using ProtoBuf; global using RabbitMQ.Client; global using RabbitMQ.Client.Events; -global using StackExchange.Redis.Extensions.Core.Abstractions; +global using StackExchange.Redis.Extensions.Core.Abstractions; diff --git a/common/ASC.Core.Common/Encryption/EncryptionSettings.cs b/common/ASC.Core.Common/Encryption/EncryptionSettings.cs index 7f7308d889..eca36d5132 100644 --- a/common/ASC.Core.Common/Encryption/EncryptionSettings.cs +++ b/common/ASC.Core.Common/Encryption/EncryptionSettings.cs @@ -24,8 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ProtoBuf; - namespace ASC.Core.Encryption; [ProtoContract] diff --git a/common/ASC.Core.Common/GlobalUsings.cs b/common/ASC.Core.Common/GlobalUsings.cs index b15ff869cf..43f5865cc6 100644 --- a/common/ASC.Core.Common/GlobalUsings.cs +++ b/common/ASC.Core.Common/GlobalUsings.cs @@ -37,7 +37,6 @@ global using System.Linq.Expressions; global using System.Net; global using System.Reflection; global using System.Resources; -global using System.Runtime.Caching; global using System.Runtime.Serialization; global using System.Security; global using System.Security.Authentication; @@ -83,6 +82,7 @@ global using ASC.Core.Common.EF.Model.Resource; global using ASC.Core.Common.Hosting.Extensions; global using ASC.Core.Common.Hosting.Interfaces; global using ASC.Core.Common.Notify; +global using ASC.Core.Common.Notify.IntegrationEvents.Events; global using ASC.Core.Common.Notify.Jabber; global using ASC.Core.Common.Notify.Push; global using ASC.Core.Common.Notify.Telegram; @@ -97,6 +97,8 @@ global using ASC.Core.Security.Authentication; global using ASC.Core.Security.Authorizing; global using ASC.Core.Tenants; global using ASC.Core.Users; +global using ASC.EventBus.Abstractions; +global using ASC.EventBus.Events; global using ASC.Notify; global using ASC.Notify.Channels; global using ASC.Notify.Cron; @@ -123,6 +125,7 @@ global using Microsoft.EntityFrameworkCore.Metadata; global using Microsoft.EntityFrameworkCore.Migrations; global using Microsoft.EntityFrameworkCore.Query; global using Microsoft.EntityFrameworkCore.Query.SqlExpressions; +global using Microsoft.Extensions.Caching.Memory; global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Hosting; @@ -136,10 +139,8 @@ global using Newtonsoft.Json; global using NVelocity; global using NVelocity.App.Events; +global using ProtoBuf; + global using Telegram.Bot; global using static ASC.Security.Cryptography.EmailValidationKeyProvider; - -global using ASC.Core.Common.Notify.IntegrationEvents.Events; -global using ASC.EventBus.Abstractions; -global using Microsoft.Extensions.Caching.Memory; \ No newline at end of file diff --git a/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifyInvokeSendMethodRequestedIntegrationEvent.cs b/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifyInvokeSendMethodRequestedIntegrationEvent.cs index 2eedf09d13..d8805ae48a 100644 --- a/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifyInvokeSendMethodRequestedIntegrationEvent.cs +++ b/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifyInvokeSendMethodRequestedIntegrationEvent.cs @@ -24,9 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ASC.EventBus.Events; -using ProtoBuf; - namespace ASC.Core.Common.Notify.IntegrationEvents.Events; [ProtoContract] diff --git a/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendMessageRequestedIntegrationEvent.cs b/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendMessageRequestedIntegrationEvent.cs index 18b9cdb711..872d8c6da1 100644 --- a/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendMessageRequestedIntegrationEvent.cs +++ b/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendMessageRequestedIntegrationEvent.cs @@ -24,9 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ASC.EventBus.Events; -using ProtoBuf; - namespace ASC.Core.Common.Notify.IntegrationEvents.Events; [ProtoContract] diff --git a/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendTelegramMessageRequestedIntegrationEvent.cs b/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendTelegramMessageRequestedIntegrationEvent.cs index 854897dd52..30bf90b40b 100644 --- a/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendTelegramMessageRequestedIntegrationEvent.cs +++ b/common/ASC.Core.Common/Notify/IntegrationEvents/Events/NotifySendTelegramMessageRequestedIntegrationEvent.cs @@ -24,9 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ASC.EventBus.Events; -using ProtoBuf; - namespace ASC.Core.Common.Notify.IntegrationEvents.Events; [ProtoContract] diff --git a/common/ASC.Core.Common/Notify/Messages/NotifyInvoke.cs b/common/ASC.Core.Common/Notify/Messages/NotifyInvoke.cs index d541bd91ea..f85141a5c5 100644 --- a/common/ASC.Core.Common/Notify/Messages/NotifyInvoke.cs +++ b/common/ASC.Core.Common/Notify/Messages/NotifyInvoke.cs @@ -24,8 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ProtoBuf; - namespace ASC.Notify.Messages; [ProtoContract] diff --git a/common/ASC.Core.Common/Notify/Messages/NotifyMessage.cs b/common/ASC.Core.Common/Notify/Messages/NotifyMessage.cs index be3909293c..7dad14c333 100644 --- a/common/ASC.Core.Common/Notify/Messages/NotifyMessage.cs +++ b/common/ASC.Core.Common/Notify/Messages/NotifyMessage.cs @@ -24,8 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ProtoBuf; - namespace ASC.Notify.Messages; [ProtoContract] diff --git a/common/ASC.Core.Common/Notify/Messages/NotifyMessageAttachment.cs b/common/ASC.Core.Common/Notify/Messages/NotifyMessageAttachment.cs index d38d6124b2..c35f887c66 100644 --- a/common/ASC.Core.Common/Notify/Messages/NotifyMessageAttachment.cs +++ b/common/ASC.Core.Common/Notify/Messages/NotifyMessageAttachment.cs @@ -24,8 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ProtoBuf; - namespace ASC.Notify.Messages; [ProtoContract] diff --git a/common/ASC.Data.Storage/Encryption/IntegrationEvents/EventHandling/EncryptionDataStorageRequestedIntegrationEventHandler.cs b/common/ASC.Data.Storage/Encryption/IntegrationEvents/EventHandling/EncryptionDataStorageRequestedIntegrationEventHandler.cs index 4010a1a67a..f5f8a33cff 100644 --- a/common/ASC.Data.Storage/Encryption/IntegrationEvents/EventHandling/EncryptionDataStorageRequestedIntegrationEventHandler.cs +++ b/common/ASC.Data.Storage/Encryption/IntegrationEvents/EventHandling/EncryptionDataStorageRequestedIntegrationEventHandler.cs @@ -24,26 +24,16 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ASC.Data.Storage.Encryption.IntegrationEvents.Events; -using ASC.EventBus.Abstractions; - namespace ASC.Notify.IntegrationEvents.EventHandling; [Scope] public class EncryptionDataStorageRequestedIntegrationEventHandler : IIntegrationEventHandler { - private readonly ILog _logger; - private readonly IServiceScopeFactory _serviceScopeFactory; private readonly EncryptionWorker _encryptionWorker; - public EncryptionDataStorageRequestedIntegrationEventHandler( - IOptionsMonitor logger, - EncryptionWorker encryptionWorker, - IServiceScopeFactory serviceScopeFactory) + public EncryptionDataStorageRequestedIntegrationEventHandler(EncryptionWorker encryptionWorker) { - _logger = logger.CurrentValue; _encryptionWorker = encryptionWorker; - _serviceScopeFactory = serviceScopeFactory; } public async Task Handle(EncryptionDataStorageRequestedIntegration @event) diff --git a/common/ASC.Data.Storage/Encryption/IntegrationEvents/Events/EncryptionDataStorageRequestedIntegration.cs b/common/ASC.Data.Storage/Encryption/IntegrationEvents/Events/EncryptionDataStorageRequestedIntegration.cs index 79aea4eac1..3efff15d03 100644 --- a/common/ASC.Data.Storage/Encryption/IntegrationEvents/Events/EncryptionDataStorageRequestedIntegration.cs +++ b/common/ASC.Data.Storage/Encryption/IntegrationEvents/Events/EncryptionDataStorageRequestedIntegration.cs @@ -24,11 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - -using ASC.EventBus.Events; - -using ProtoBuf; - namespace ASC.Data.Storage.Encryption.IntegrationEvents.Events; [ProtoContract] diff --git a/common/ASC.Data.Storage/GlobalUsings.cs b/common/ASC.Data.Storage/GlobalUsings.cs index 7de5742a37..6dcba0b6e7 100644 --- a/common/ASC.Data.Storage/GlobalUsings.cs +++ b/common/ASC.Data.Storage/GlobalUsings.cs @@ -34,7 +34,7 @@ global using System.Text; global using System.Text.Json; global using System.Text.Json.Serialization; global using System.Web; - + global using Amazon; global using Amazon.CloudFront; global using Amazon.CloudFront.Model; @@ -42,7 +42,7 @@ global using Amazon.S3; global using Amazon.S3.Model; global using Amazon.S3.Transfer; global using Amazon.Util; - + global using ASC.Common; global using ASC.Common.Caching; global using ASC.Common.Logging; @@ -59,16 +59,19 @@ global using ASC.Data.Storage; global using ASC.Data.Storage.Configuration; global using ASC.Data.Storage.DiscStorage; global using ASC.Data.Storage.Encryption; +global using ASC.Data.Storage.Encryption.IntegrationEvents.Events; global using ASC.Data.Storage.GoogleCloud; global using ASC.Data.Storage.RackspaceCloud; global using ASC.Data.Storage.S3; +global using ASC.EventBus.Abstractions; +global using ASC.EventBus.Events; global using ASC.Notify.Messages; global using ASC.Protos.Migration; global using ASC.Security.Cryptography; - + global using Google.Apis.Auth.OAuth2; global using Google.Cloud.Storage.V1; - + global using Microsoft.AspNetCore.Builder; global using Microsoft.AspNetCore.Hosting; global using Microsoft.AspNetCore.Http; @@ -77,11 +80,12 @@ global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.Options; - + global using net.openstack.Core.Domain; global using net.openstack.Providers.Rackspace; - + +global using ProtoBuf; + global using static Google.Cloud.Storage.V1.UrlSigner; - -global using MimeMapping = ASC.Common.Web.MimeMapping; - + +global using MimeMapping = ASC.Common.Web.MimeMapping; diff --git a/common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs b/common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs index 66f2c77cab..8ebdb086fc 100644 --- a/common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs +++ b/common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs @@ -41,17 +41,17 @@ global using ASC.Data.Backup.IntegrationEvents.EventHandling; global using ASC.Data.Backup.Services; global using ASC.Data.Backup.Storage; global using ASC.EventBus.Abstractions; +global using ASC.EventBus.Events; global using ASC.Files.Core; global using ASC.Web.Studio.Core.Notify; - + global using Autofac; - + global using Microsoft.AspNetCore.Builder; global using Microsoft.Extensions.Configuration; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Hosting; global using Microsoft.Extensions.Hosting.WindowsServices; global using Microsoft.Extensions.Options; - + global using Newtonsoft.Json; -global using ASC.EventBus.Events; \ No newline at end of file diff --git a/common/services/ASC.Notify/GlobalUsings.cs b/common/services/ASC.Notify/GlobalUsings.cs index ad01134232..314318a3be 100644 --- a/common/services/ASC.Notify/GlobalUsings.cs +++ b/common/services/ASC.Notify/GlobalUsings.cs @@ -30,7 +30,6 @@ global using System.Reflection; global using ASC.Api.Core; global using ASC.Api.Core.Extensions; global using ASC.Common; -global using ASC.Common.Caching; global using ASC.Common.DependencyInjection; global using ASC.Common.Logging; global using ASC.Common.Mapping; @@ -38,9 +37,14 @@ global using ASC.Core; global using ASC.Core.Common.EF; global using ASC.Core.Common.EF.Context; global using ASC.Core.Common.EF.Model; +global using ASC.Core.Common.Hosting; +global using ASC.Core.Common.Hosting.Interfaces; +global using ASC.Core.Common.Notify.IntegrationEvents.Events; global using ASC.Core.Common.Settings; global using ASC.Core.Notify.Senders; +global using ASC.EventBus.Abstractions; global using ASC.Notify.Config; +global using ASC.Notify.IntegrationEvents.EventHandling; global using ASC.Notify.Messages; global using ASC.Notify.Services; global using ASC.Web.Core.WhiteLabel; @@ -50,20 +54,9 @@ global using Autofac; global using AutoMapper; -global using Google.Protobuf.Collections; - global using Microsoft.AspNetCore.Builder; global using Microsoft.EntityFrameworkCore; global using Microsoft.Extensions.Hosting.WindowsServices; global using Microsoft.Extensions.Options; -global using Newtonsoft.Json; - -global using ASC.EventBus.Abstractions; -global using ASC.EventBus.Events; -global using ASC.Notify.IntegrationEvents.EventHandling; -global using ASC.Core.Common.Notify.IntegrationEvents.Events; - -global using ASC.Core.Common.Hosting; -global using ASC.Core.Common.Hosting.Interfaces; - +global using Newtonsoft.Json; \ No newline at end of file diff --git a/common/services/ASC.TelegramService/GlobalUsings.cs b/common/services/ASC.TelegramService/GlobalUsings.cs index 330e853b3a..5b17bf9615 100644 --- a/common/services/ASC.TelegramService/GlobalUsings.cs +++ b/common/services/ASC.TelegramService/GlobalUsings.cs @@ -26,9 +26,8 @@ global using System.Net; global using System.Reflection; -global using System.Runtime.Caching; global using System.Text.RegularExpressions; - + global using ASC.Api.Core; global using ASC.Api.Core.Extensions; global using ASC.Common; @@ -37,25 +36,23 @@ global using ASC.Common.Logging; global using ASC.Core; global using ASC.Core.Common.Configuration; global using ASC.Core.Common.Notify; +global using ASC.Core.Common.Notify.IntegrationEvents.Events; global using ASC.Core.Common.Notify.Telegram; +global using ASC.EventBus.Abstractions; global using ASC.FederatedLogin.LoginProviders; global using ASC.Notify.Messages; global using ASC.TelegramService; global using ASC.TelegramService.Core; - +global using ASC.TelegramService.IntegrationEvents.EventHandling; + global using Autofac; global using Microsoft.AspNetCore.Builder; +global using Microsoft.Extensions.Caching.Distributed; global using Microsoft.Extensions.Hosting.WindowsServices; global using Microsoft.Extensions.Options; - + global using Telegram.Bot; -global using Telegram.Bot.Args; -global using Telegram.Bot.Types; -global using ASC.EventBus.Abstractions; -global using ASC.TelegramService.IntegrationEvents.EventHandling; global using Telegram.Bot.Exceptions; +global using Telegram.Bot.Types; global using Telegram.Bot.Types.Enums; -global using Microsoft.Extensions.Caching.Distributed; - - diff --git a/common/services/ASC.TelegramService/IntegrationEvents/EventHandling/TelegramSendMessageRequestedIntegrationEventHandler.cs b/common/services/ASC.TelegramService/IntegrationEvents/EventHandling/TelegramSendMessageRequestedIntegrationEventHandler.cs index c5beb807a1..40d089e5e1 100644 --- a/common/services/ASC.TelegramService/IntegrationEvents/EventHandling/TelegramSendMessageRequestedIntegrationEventHandler.cs +++ b/common/services/ASC.TelegramService/IntegrationEvents/EventHandling/TelegramSendMessageRequestedIntegrationEventHandler.cs @@ -24,8 +24,6 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -using ASC.Core.Common.Notify.IntegrationEvents.Events; - namespace ASC.TelegramService.IntegrationEvents.EventHandling; [Scope] diff --git a/common/services/ASC.TelegramService/TelegramHandler.cs b/common/services/ASC.TelegramService/TelegramHandler.cs index 9a2e7918cc..3c65856df7 100644 --- a/common/services/ASC.TelegramService/TelegramHandler.cs +++ b/common/services/ASC.TelegramService/TelegramHandler.cs @@ -33,11 +33,11 @@ public class TelegramHandler private readonly CommandModule _command; private readonly ILog _log; private readonly IServiceScopeFactory _scopeFactory; - private readonly IDistributedCache _distributedCache; - + private readonly IDistributedCache _distributedCache; + public TelegramHandler(IDistributedCache distributedCache, - CommandModule command, - IOptionsMonitor option, + CommandModule command, + IOptionsMonitor option, IServiceScopeFactory scopeFactory) { _command = command; @@ -51,9 +51,16 @@ public class TelegramHandler public async Task SendMessage(NotifyMessage msg) { - if (string.IsNullOrEmpty(msg.Reciever)) return; - if (!_clients.ContainsKey(msg.TenantId)) return; - + if (string.IsNullOrEmpty(msg.Reciever)) + { + return; + } + + if (!_clients.ContainsKey(msg.TenantId)) + { + return; + } + var scope = _scopeFactory.CreateScope(); var telegramDao = scope.ServiceProvider.GetService(); @@ -81,8 +88,11 @@ public class TelegramHandler public void DisableClient(int tenantId) { - if (!_clients.ContainsKey(tenantId)) return; - + if (!_clients.ContainsKey(tenantId)) + { + return; + } + var client = _clients[tenantId]; if (client.CancellationTokenSource != null) @@ -163,8 +173,8 @@ public class TelegramHandler var dateExpires = DateTimeOffset.Now.AddMinutes(_clients[tenantId].TokenLifeSpan); _distributedCache.SetString(token, userKey, new DistributedCacheEntryOptions - { - AbsoluteExpiration = dateExpires + { + AbsoluteExpiration = dateExpires }); } @@ -183,10 +193,21 @@ public class TelegramHandler async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken, int tenantId) { - if (update.Type != UpdateType.Message) return; - if (update.Message.Type != MessageType.Text) return; - if (String.IsNullOrEmpty(update.Message.Text) || update.Message.Text[0] != '/') return; - + if (update.Type != UpdateType.Message) + { + return; + } + + if (update.Message.Type != MessageType.Text) + { + return; + } + + if (String.IsNullOrEmpty(update.Message.Text) || update.Message.Text[0] != '/') + { + return; + } + await _command.HandleCommand(update.Message, botClient, tenantId); } diff --git a/products/ASC.Files/Core/GlobalUsings.cs b/products/ASC.Files/Core/GlobalUsings.cs index 418f3faa9c..52a28e7a5a 100644 --- a/products/ASC.Files/Core/GlobalUsings.cs +++ b/products/ASC.Files/Core/GlobalUsings.cs @@ -76,6 +76,7 @@ global using ASC.Data.Storage; global using ASC.ElasticSearch; global using ASC.ElasticSearch.Core; global using ASC.ElasticSearch.Service; +global using ASC.EventBus.Events; global using ASC.FederatedLogin; global using ASC.FederatedLogin.Helpers; global using ASC.FederatedLogin.LoginProviders; @@ -86,6 +87,7 @@ global using ASC.Files.Core.ApiModels.ResponseDto; global using ASC.Files.Core.Core.Entries; global using ASC.Files.Core.Data; global using ASC.Files.Core.EF; +global using ASC.Files.Core.IntegrationEvents.Events; global using ASC.Files.Core.Mapping; global using ASC.Files.Core.Resources; global using ASC.Files.Core.Security; @@ -186,6 +188,8 @@ global using Nest; global using Newtonsoft.Json; global using Newtonsoft.Json.Linq; +global using ProtoBuf; + global using static ASC.Files.Core.Data.AbstractDao; global using static ASC.Web.Core.Files.DocumentService; global using static ASC.Web.Files.Services.DocumentService.DocumentServiceTracker; @@ -211,6 +215,3 @@ global using JsonTokenType = System.Text.Json.JsonTokenType; global using JsonConverter = System.Text.Json.Serialization.JsonConverter; global using JsonConverterAttribute = System.Text.Json.Serialization.JsonConverterAttribute; global using JsonIgnoreAttribute = System.Text.Json.Serialization.JsonIgnoreAttribute; -global using ASC.EventBus.Events; -global using ProtoBuf; -global using ASC.Files.Core.IntegrationEvents.Events; \ No newline at end of file