diff --git a/common/ASC.Core.Common/Quota/QuotaSocketManager.cs b/common/ASC.Core.Common/Quota/QuotaSocketManager.cs index 6b4022ae02..d1b1e9f871 100644 --- a/common/ASC.Core.Common/Quota/QuotaSocketManager.cs +++ b/common/ASC.Core.Common/Quota/QuotaSocketManager.cs @@ -41,7 +41,7 @@ public class QuotaSocketManager : SocketServiceClient _tenantManager = tenantManager; } - public async Task ChangeQuotaUsedValue(string featureId, object value) + public async Task ChangeQuotaUsedValueAsync(string featureId, object value) { var room = GetQuotaRoom(); diff --git a/common/ASC.Core.Common/Quota/TenantQuotaFeatureStatHelper.cs b/common/ASC.Core.Common/Quota/TenantQuotaFeatureStatHelper.cs index 4d2f1e4736..a98c295302 100644 --- a/common/ASC.Core.Common/Quota/TenantQuotaFeatureStatHelper.cs +++ b/common/ASC.Core.Common/Quota/TenantQuotaFeatureStatHelper.cs @@ -33,7 +33,7 @@ public class TenantQuotaFeatureStatHelper { _serviceProvider = serviceProvider; } - public async Task<(string Name, T1 Value)> GetStat() where T : TenantQuotaFeature + public async Task<(string Name, T1 Value)> GetStatAsync() where T : TenantQuotaFeature { var statisticProvider = (ITenantQuotaFeatureStat)_serviceProvider.GetService(typeof(ITenantQuotaFeatureStat<,>).MakeGenericType(typeof(T), typeof(T1))); @@ -42,7 +42,7 @@ public class TenantQuotaFeatureStatHelper if (statisticProvider != null) { - return (name, await statisticProvider.GetValue()); + return (name, await statisticProvider.GetValueAsync()); } return (name, default(T1)); diff --git a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs index fda5e85100..b3f086a1ad 100644 --- a/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs +++ b/products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs @@ -461,16 +461,16 @@ class FileMoveCopyOperation : FileOperation, T> await countRoomChecker.CheckAppend(); newFolderId = await FolderDao.MoveFolderAsync(folder.Id, toFolderId, CancellationToken); - var (name, value) = await tenantQuotaFeatureStatHelper.GetStat(); - _ = quotaSocketManager.ChangeQuotaUsedValue(name, value); + var (name, value) = await tenantQuotaFeatureStatHelper.GetStatAsync(); + _ = quotaSocketManager.ChangeQuotaUsedValueAsync(name, value); } else if (isRoom && toFolder.FolderType == FolderType.Archive) { await _semaphore.WaitAsync(); newFolderId = await FolderDao.MoveFolderAsync(folder.Id, toFolderId, CancellationToken); - var (name, value) = await tenantQuotaFeatureStatHelper.GetStat(); - _ = quotaSocketManager.ChangeQuotaUsedValue(name, value); + var (name, value) = await tenantQuotaFeatureStatHelper.GetStatAsync(); + _ = quotaSocketManager.ChangeQuotaUsedValueAsync(name, value); } else { diff --git a/products/ASC.Files/Server/DocStore b/products/ASC.Files/Server/DocStore index 776d5631ee..8933c733a8 160000 --- a/products/ASC.Files/Server/DocStore +++ b/products/ASC.Files/Server/DocStore @@ -1 +1 @@ -Subproject commit 776d5631ee3e26f9f20d24415a5b7ad85d40b64d +Subproject commit 8933c733a8651c221f62b359fa92e4305f7bd5bc diff --git a/web/ASC.Web.Core/PublicResources/Resource.Designer.cs b/web/ASC.Web.Core/PublicResources/Resource.Designer.cs index 682bb6aca6..5f28b1f245 100644 --- a/web/ASC.Web.Core/PublicResources/Resource.Designer.cs +++ b/web/ASC.Web.Core/PublicResources/Resource.Designer.cs @@ -19,7 +19,7 @@ namespace ASC.Web.Core.PublicResources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resource {