Merge branch 'develop' into feature/mobile-main-button

ASC.Tests.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
+# Visual Studio Version 17
-VisualStudioVersion = 16.0.30413.136
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Files.Tests", "products\ASC.Files\Tests\ASC.Files.Tests.csproj", "{EFB99A37-EF25-4A0F-8D7A-786402B1554C}"
 EndProject
@@ -73,7 +73,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Webhooks.Tests", "commo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Webhooks.Service", "common\services\ASC.Webhooks.Service\ASC.Webhooks.Service.csproj", "{23310CB9-1A14-4ED5-BF81-8BD38277FEFE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Web.Api.Tests", "common\Tests\ASC.Web.Api.Tests\ASC.Web.Api.Tests.csproj", "{14823E93-C749-4069-9E0A-95E63DE0B254}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Web.Api.Tests", "common\Tests\ASC.Web.Api.Tests\ASC.Web.Api.Tests.csproj", "{14823E93-C749-4069-9E0A-95E63DE0B254}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Backup.Core", "common\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj", "{5E948877-52BD-42B9-95A9-0FF37931D0A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Data.Encryption", "common\ASC.Data.Encryption\ASC.Data.Encryption.csproj", "{9E572FE2-8C3C-46B2-A314-532F7198B3EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.AuditTrail", "common\services\ASC.AuditTrail\ASC.AuditTrail.csproj", "{B53587B7-58F6-48A9-B122-69BEA3E2572A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -209,10 +215,6 @@ Global
 		{8FAD3D1B-3ADC-470C-9933-CAE1B95A8599}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8FAD3D1B-3ADC-470C-9933-CAE1B95A8599}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8FAD3D1B-3ADC-470C-9933-CAE1B95A8599}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14823E93-C749-4069-9E0A-95E63DE0B254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14823E93-C749-4069-9E0A-95E63DE0B254}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14823E93-C749-4069-9E0A-95E63DE0B254}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14823E93-C749-4069-9E0A-95E63DE0B254}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0475D4F-29B7-490C-85C2-8AFD60118B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0475D4F-29B7-490C-85C2-8AFD60118B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0475D4F-29B7-490C-85C2-8AFD60118B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -224,7 +226,23 @@ Global
 		{23310CB9-1A14-4ED5-BF81-8BD38277FEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23310CB9-1A14-4ED5-BF81-8BD38277FEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23310CB9-1A14-4ED5-BF81-8BD38277FEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23310CB9-1A14-4ED5-BF81-8BD38277FEFE}.Release|Any CPU.Build.0 = Release|Any CPU	EndGlobalSection
+		{14823E93-C749-4069-9E0A-95E63DE0B254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14823E93-C749-4069-9E0A-95E63DE0B254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14823E93-C749-4069-9E0A-95E63DE0B254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14823E93-C749-4069-9E0A-95E63DE0B254}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E948877-52BD-42B9-95A9-0FF37931D0A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E948877-52BD-42B9-95A9-0FF37931D0A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E948877-52BD-42B9-95A9-0FF37931D0A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E948877-52BD-42B9-95A9-0FF37931D0A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E572FE2-8C3C-46B2-A314-532F7198B3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E572FE2-8C3C-46B2-A314-532F7198B3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E572FE2-8C3C-46B2-A314-532F7198B3EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E572FE2-8C3C-46B2-A314-532F7198B3EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B53587B7-58F6-48A9-B122-69BEA3E2572A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B53587B7-58F6-48A9-B122-69BEA3E2572A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B53587B7-58F6-48A9-B122-69BEA3E2572A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B53587B7-58F6-48A9-B122-69BEA3E2572A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection

build/install/docker/.env

@@ -6,6 +6,7 @@
     ELK_VERSION=7.13.1
     SERVICE_PORT=5050
     CONTAINER_PREFIX=${PRODUCT}-
+    DOCUMENT_SERVER_IMAGE_NAME=onlyoffice/4testing-documentserver-ee:latest
     DOCKER_TAG=latest
     DOCKERFILE=Dockerfile.app
 

build/install/docker/ds.yml

@@ -1,7 +1,7 @@
 version: '3.6'
 services:
   onlyoffice-document-server:
-    image: "${REPO}/${STATUS}documentserver:latest"
+    image: "${DOCUMENT_SERVER_IMAGE_NAME}"
     container_name: ${DOCUMENT_SERVER_HOST}
     # Strings below enable the JSON Web Token validation.
     environment:

common/ASC.Api.Core/ASC.Api.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
@@ -17,7 +17,7 @@
     <PackageReference Include="AspNetCore.HealthChecks.NpgSql" Version="5.0.2" />
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="NLog" Version="4.7.10" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
   </ItemGroup>
 

common/ASC.Api.Core/Core/BaseStartup.cs

@@ -73,7 +73,7 @@ namespace ASC.Api.Core
             Action<JsonOptions> jsonOptions = options =>
                 {
                     options.JsonSerializerOptions.WriteIndented = false;
-                                   options.JsonSerializerOptions.IgnoreNullValues = true;
+                    options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
                     options.JsonSerializerOptions.Converters.Add(new ApiDateTimeConverter());
 
                     if (Converters != null)

common/ASC.Common/ASC.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <FileUpgradeFlags />
     <UpgradeBackupLocation />
     <AssemblyTitle>ASC.Common</AssemblyTitle>
@@ -39,13 +39,12 @@
     </PackageReference>
     <PackageReference Include="JWT" Version="6.1.4" />
     <PackageReference Include="log4net" Version="2.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 <!-- <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -56,7 +55,6 @@
     </PackageReference> -->
     <PackageReference Include="NLog" Version="4.7.10" />
     <PackageReference Include="NVelocity" Version="1.2.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <Protobuf Include="protos\AscCacheItem.proto" />

common/ASC.Common/Security/Cryptography/InstanceCrypto.cs

@@ -50,12 +50,14 @@ namespace ASC.Security.Cryptography
 
         public byte[] Encrypt(byte[] data)
         {
-            var hasher = Rijndael.Create();
+            var hasher = Aes.Create();
             hasher.Key = EKey();
             hasher.IV = new byte[hasher.BlockSize >> 3];
+
             using var ms = new MemoryStream();
             using var ss = new CryptoStream(ms, hasher.CreateEncryptor(), CryptoStreamMode.Write);
-            ss.Write(data, 0, data.Length);
+            using var plainTextStream = new MemoryStream(data);
+            plainTextStream.CopyTo(ss);
             ss.FlushFinalBlock();
             hasher.Clear();
             return ms.ToArray();
@@ -63,23 +65,24 @@ namespace ASC.Security.Cryptography
 
         public string Decrypt(string data)
         {
-            return Encoding.UTF8.GetString(Decrypt(Convert.FromBase64String(data)));
+            return Decrypt(Convert.FromBase64String(data));
         }
 
-        public byte[] Decrypt(byte[] data)
+        public string Decrypt(byte[] data)
         {
-            var hasher = Rijndael.Create();
+            var hasher = Aes.Create();
             hasher.Key = EKey();
             hasher.IV = new byte[hasher.BlockSize >> 3];
 
-            using var ms = new MemoryStream(data);
+            using (MemoryStream msDecrypt = new MemoryStream(data))
-            using var ss = new CryptoStream(ms, hasher.CreateDecryptor(), CryptoStreamMode.Read);
+            using (CryptoStream csDecrypt = new CryptoStream(msDecrypt, hasher.CreateDecryptor(), CryptoStreamMode.Read))
-            var buffer = new byte[data.Length];
+            using (StreamReader srDecrypt = new StreamReader(csDecrypt))
-            var size = ss.Read(buffer, 0, buffer.Length);
+            {
-            hasher.Clear();
+
-            var newBuffer = new byte[size];
+                // Read the decrypted bytes from the decrypting stream
-            Array.Copy(buffer, newBuffer, size);
+                // and place them in a string.
-            return newBuffer;
+                return srDecrypt.ReadToEnd();
+            }
         }
 
         private byte[] EKey()

common/ASC.Core.Common/ASC.Core.Common.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
     <ProjectGuid>{A51D0454-4AFA-46DE-89D4-B03D37E1816C}</ProjectGuid>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <FileUpgradeFlags />
     <UpgradeBackupLocation />
     <AssemblyTitle>ASC.Core.Common</AssemblyTitle>
@@ -51,14 +51,13 @@
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="3.5.1.25" />
     <PackageReference Include="AWSSDK.SimpleEmail" Version="3.5.0.27" />
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="Grpc.Tools" Version="2.32.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MailKit" Version="2.5.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
     <PackageReference Include="Telegram.Bot" Version="15.7.1" />
   </ItemGroup>
   <ItemGroup>

common/ASC.Core.Common/Billing/BillingClient.cs

@@ -28,7 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
+using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Security.Cryptography;
 using System.ServiceModel;
@@ -218,16 +218,17 @@ namespace ASC.Core.Billing
         {
             var url = _billingDomain + method;
 
-            var request = WebRequest.Create(url);
+            var request = new HttpRequestMessage();
-            request.Method = "POST";
+            request.RequestUri = new Uri(url);
-            request.Timeout = 60000;
+            request.Method = HttpMethod.Post;
-            request.ContentType = "application/json";
-
             if (!string.IsNullOrEmpty(_billingKey))
             {
                 request.Headers.Add("Authorization", CreateAuthToken(_billingKey, _billingSecret));
             }
 
+            using var httpClient = new HttpClient();
+            httpClient.Timeout = TimeSpan.FromMilliseconds(60000);
+
             var data = new Dictionary<string, List<string>>();
             if (!string.IsNullOrEmpty(portalId))
             {
@@ -244,20 +245,13 @@ namespace ASC.Core.Billing
                     data[parameter.Item1].Add(parameter.Item2);
                 }
             }
-            var body = JsonSerializer.Serialize(data);
 
-            var bytes = Encoding.UTF8.GetBytes(body ?? "");
+            var body = JsonSerializer.Serialize(data);
-            request.ContentLength = bytes.Length;
+            request.Content = new StringContent(body, Encoding.UTF8, "application/json");
-            using (var stream = request.GetRequestStream())
-            {
-                stream.Write(bytes, 0, bytes.Length);
-            }
 
             string result;
-            try
+            using (var response = httpClient.Send(request))
-            {
+            using (var stream = response.Content.ReadAsStream())
-                using (var response = request.GetResponse())
-                using (var stream = response.GetResponseStream())
             {
                 if (stream == null)
                 {
@@ -268,12 +262,6 @@ namespace ASC.Core.Billing
                     result = readStream.ReadToEnd();
                 }
             }
-            }
-            catch (WebException)
-            {
-                request.Abort();
-                throw;
-            }
 
             if (string.IsNullOrEmpty(result))
             {

common/ASC.Core.Common/Billing/CouponManager.cs

@@ -155,7 +155,7 @@ namespace ASC.Core.Common.Billing
         {
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
             const string applicationJson = "application/json";
-            var httpClient = new HttpClient { BaseAddress = BaseAddress, Timeout = TimeSpan.FromMinutes(3) };
+            using var httpClient = new HttpClient { BaseAddress = BaseAddress, Timeout = TimeSpan.FromMinutes(3) };
             httpClient.DefaultRequestHeaders.TryAddWithoutValidation("accept", applicationJson);
             httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Content-Type", applicationJson);
             httpClient.DefaultRequestHeaders.TryAddWithoutValidation("X-Avangate-Authentication", CreateAuthHeader());

common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs

@@ -28,6 +28,7 @@ using System;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text.RegularExpressions;
 
 using ASC.Common.Module;
@@ -78,16 +79,21 @@ namespace ASC.Core.Configuration
         {
             try
             {
-                var request = WebRequest.Create("http://169.254.169.254/latest/meta-data/public-hostname");
+                var request = new HttpRequestMessage();
-                request.Timeout = 5000;
+                request.RequestUri = new Uri("http://169.254.169.254/latest/meta-data/public-hostname");
-                using var responce = request.GetResponse();
+                request.Method = HttpMethod.Get;
-                using var stream = responce.GetResponseStream();
+
+                using var httpClient = new HttpClient();
+                httpClient.Timeout = TimeSpan.FromMilliseconds(5000);
+
+                using var responce = httpClient.Send(request);
+                using var stream = responce.Content.ReadAsStream();
                 using var reader = new StreamReader(stream);
                 return reader.ReadToEnd();
             }
-            catch (WebException ex)
+            catch (HttpRequestException ex)
             {
-                if (ex.Status == WebExceptionStatus.ProtocolError)
+                if (ex.StatusCode == HttpStatusCode.NotFound || ex.StatusCode == HttpStatusCode.Conflict)
                 {
                     throw;
                 }

common/ASC.Core.Common/Context/Impl/PaymentManager.cs

@@ -27,8 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
+using System.Net.Http;
-using System.Net;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
@@ -40,8 +39,6 @@ using ASC.Core.Billing;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Configuration;
 
-using Newtonsoft.Json;
-
 
 namespace ASC.Core
 {
@@ -110,21 +107,15 @@ namespace ASC.Core
 
             var now = DateTime.UtcNow;
             var actionUrl = "/partnerapi/ActivateKey?code=" + HttpUtility.UrlEncode(key) + "&portal=" + HttpUtility.UrlEncode(TenantManager.GetCurrentTenant().TenantAlias);
-            using var webClient = new WebClient();
+
-            webClient.Headers.Add("Authorization", GetPartnerAuthHeader(actionUrl));
+            var request = new HttpRequestMessage();
-            try
+            request.Headers.Add("Authorization", GetPartnerAuthHeader(actionUrl));
-            {
+            request.RequestUri = new Uri(partnerUrl + actionUrl);
-                webClient.DownloadData(partnerUrl + actionUrl);
+
-            }
+            using var httpClient = new HttpClient();
-            catch (WebException we)
+
-            {
+            using var response = httpClient.Send(request);
-                var error = GetException(we);
+
-                if (error != null)
-                {
-                    throw error;
-                }
-                throw;
-            }
             tariffService.ClearCache(TenantManager.GetCurrentTenant().TenantId);
 
             var timeout = DateTime.UtcNow - now - TimeSpan.FromSeconds(5);
@@ -145,27 +136,5 @@ namespace ASC.Core
             return string.Format("ASC :{0}:{1}", now, hash);
         }
 
-        private static Exception GetException(WebException we)
-        {
-            var response = (HttpWebResponse)we.Response;
-            if (response.StatusCode == HttpStatusCode.InternalServerError)
-            {
-                using var stream = response.GetResponseStream();
-                using var reader = new StreamReader(stream, Encoding.UTF8);
-                var result = reader.ReadToEnd();
-                var excInfo = JsonConvert.DeserializeObject<ExceptionJson>(result);
-                return (Exception)Activator.CreateInstance(Type.GetType(excInfo.exceptionType, true), excInfo.exceptionMessage);
-            }
-            return null;
-        }
-
-
-        private class ExceptionJson
-        {
-            public string message = null;
-            public string exceptionMessage = null;
-            public string exceptionType = null;
-            public string stackTrace = null;
-        }
     }
 }

common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+
-
 using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Core.Common.EF.Model

common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+
-
 using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Core.Common.EF.Model

common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+
-
 using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Core.Common.EF.Model.Mail

common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+
-
 using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Core.Common.EF.Model.Resource

common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+
-
 using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Core.Common.EF.Model

common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations.Schema;
+
-
 using Microsoft.EntityFrameworkCore;
 
 namespace ASC.Core.Common.EF.Model

common/ASC.Core.Common/EF/Model/User/UserPhoto.cs

@@ -1,8 +1,7 @@
 using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 using ASC.Core.Common.EF.Model;
+
 using Microsoft.EntityFrameworkCore;
 namespace ASC.Core.Common.EF
 {

common/ASC.Core.Common/Encryption/EncryptionSettings.cs

@@ -143,10 +143,7 @@ namespace ASC.Core.Encryption
             var array2 = new char[length];
             var num = 0;
 
-            using (var rng = new RNGCryptoServiceProvider())
+            array = RandomNumberGenerator.GetBytes(length);
-            {
-                rng.GetBytes(array);
-            }
 
             for (var i = 0; i < length; i++)
             {

common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs

@@ -26,8 +26,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Net;
+using System.Net.Http;
 using System.Security.Cryptography;
 using System.ServiceModel;
 using System.Text;
@@ -363,13 +364,23 @@ namespace ASC.Core.Notify.Signalr
         {
             if (!IsAvailable()) return "";
 
-            using var webClient = new WebClient();
+            var request = new HttpRequestMessage();
+            request.Headers.Add("Authorization", CreateAuthToken());
+            request.Method = HttpMethod.Post;
+            request.RequestUri = new Uri(GetMethod(method));
+
             var jsonData = JsonConvert.SerializeObject(data);
             Log.DebugFormat("Method:{0}, Data:{1}", method, jsonData);
-            webClient.Encoding = Encoding.UTF8;
+
-            webClient.Headers.Add("Authorization", CreateAuthToken());
+            request.Content = new StringContent(jsonData, Encoding.UTF8, "application/json");
-            webClient.Headers[HttpRequestHeader.ContentType] = "application/json";
+
-            return webClient.UploadString(GetMethod(method), jsonData);
+            using (var httpClient = new HttpClient())
+            using (var response = httpClient.Send(request))
+            using (var stream = response.Content.ReadAsStream())
+            using (var streamReader = new StreamReader(stream))
+            {
+                return streamReader.ReadToEnd();
+            }
         }
 
         private T MakeRequest<T>(string method, object data)

common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs

@@ -138,7 +138,7 @@ namespace ASC.Core.Common.Notify
 
             var buf = id.Concat(d).ToArray();
 
-            using var sha = new SHA256CryptoServiceProvider();
+            using var sha = SHA256.Create();
             return Convert.ToBase64String(sha.ComputeHash(buf))
                 .Replace('+', '-').Replace('/', '_').Replace("=", ""); // make base64 url safe
         }

common/ASC.Core.Common/Security/Crypto.cs

@@ -58,68 +58,56 @@ namespace ASC.Core
 
         public static string GetV(string data, int keyno, bool reverse)
         {
-            var hasher = Rijndael.Create();
+            var hasher = Aes.Create();
             hasher.Key = keyno == 1 ? GetSK1(false) : GetSK2(false);
             hasher.IV = new byte[hasher.BlockSize >> 3];
 
-            string result;
             if (reverse)
             {
                 using var ms = new MemoryStream();
                 using var ss = new CryptoStream(ms, hasher.CreateEncryptor(), CryptoStreamMode.Write);
-                var buffer = Encoding.Unicode.GetBytes(data);
+                using var plainTextStream = new MemoryStream(Convert.FromBase64String(data));
-                ss.Write(buffer, 0, buffer.Length);
+                plainTextStream.CopyTo(ss);
                 ss.FlushFinalBlock();
                 hasher.Clear();
-                result = Convert.ToBase64String(ms.ToArray());
+                return Convert.ToBase64String(ms.ToArray());
             }
             else
             {
-                var bytes = Convert.FromBase64String(data);
+                using var ms = new MemoryStream(Convert.FromBase64String(data));
-                using var ms = new MemoryStream(bytes);
                 using var ss = new CryptoStream(ms, hasher.CreateDecryptor(), CryptoStreamMode.Read);
-                var buffer = new byte[bytes.Length];
+                using var plainTextStream = new MemoryStream();
-                var size = ss.Read(buffer, 0, buffer.Length);
+                ss.CopyTo(plainTextStream);
                 hasher.Clear();
-                var newBuffer = new byte[size];
+                return Encoding.Unicode.GetString(plainTextStream.ToArray());
-                Array.Copy(buffer, newBuffer, size);
-                result = Encoding.Unicode.GetString(newBuffer);
             }
-
-            return result;
         }
 
         internal static byte[] GetV(byte[] data, int keyno, bool reverse)
         {
-            var hasher = Rijndael.Create();
+            var hasher = Aes.Create();
             hasher.Key = keyno == 1 ? GetSK1(false) : GetSK2(false);
             hasher.IV = new byte[hasher.BlockSize >> 3];
 
-            byte[] result;
             if (reverse)
             {
                 using var ms = new MemoryStream();
                 using var ss = new CryptoStream(ms, hasher.CreateEncryptor(), CryptoStreamMode.Write);
-                var buffer = data;
+                using var plainTextStream = new MemoryStream(data);
-                ss.Write(buffer, 0, buffer.Length);
+                plainTextStream.CopyTo(ss);
                 ss.FlushFinalBlock();
                 hasher.Clear();
-                result = ms.ToArray();
+                return ms.ToArray();
             }
             else
             {
-                var bytes = data;
+                using var ms = new MemoryStream(data);
-                using var ms = new MemoryStream(bytes);
                 using var ss = new CryptoStream(ms, hasher.CreateDecryptor(), CryptoStreamMode.Read);
-                var buffer = new byte[bytes.Length];
+                using var plainTextStream = new MemoryStream();
-                var size = ss.Read(buffer, 0, buffer.Length);
+                ss.CopyTo(plainTextStream);
                 hasher.Clear();
-                var newBuffer = new byte[size];
+                return plainTextStream.ToArray();
-                Array.Copy(buffer, newBuffer, size);
+            }
-                result = newBuffer;
-            }
-
-            return result;
         }
     }
 }

common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
@@ -13,8 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.14.0" />
     <PackageReference Include="Grpc" Version="2.32.0">
       <TreatAsUsed>true</TreatAsUsed>
     </PackageReference>
@@ -22,10 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
     <PackageReference Include="MySql.Data" Version="8.0.23" />
-    <PackageReference Include="SharpZipLib" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>

common/ASC.Data.Backup.Core/Tasks/KeyHelper.cs

@@ -24,8 +24,6 @@
 */
 
 
-using System.IO;
-
 using ASC.Common.Utils;
 using ASC.Data.Backup.Tasks.Modules;
 

common/ASC.Data.Encryption/ASC.Data.Encryption.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 

common/ASC.Data.Encryption/Metadata.cs

@@ -187,15 +187,14 @@ namespace ASC.Data.Encryption
 
         public SymmetricAlgorithm GetCryptographyAlgorithm()
         {
-            return new RijndaelManaged
+            var aes = Aes.Create();
-            {
+            aes.KeySize = keySize;
-                KeySize = keySize,
+            aes.BlockSize = blockSize;
-                BlockSize = blockSize,
+            aes.Key = Key;
-                Key = Key,
+            aes.IV = IV;
-                IV = IV,
+            aes.Padding = PaddingMode.PKCS7;
-                Padding = PaddingMode.PKCS7,
+            aes.Mode = CipherMode.CBC;
-                Mode = CipherMode.CBC
+            return aes;
-            };
         }
 
         public void ComputeAndWriteHmacHash(Stream stream)
@@ -245,10 +244,7 @@ namespace ASC.Data.Encryption
         {
             var random = new byte[length];
 
-            using (var rng = new RNGCryptoServiceProvider())
+            random = RandomNumberGenerator.GetBytes(length);
-            {
-                rng.GetBytes(random);
-            }
 
             return random;
         }
@@ -269,7 +265,7 @@ namespace ASC.Data.Encryption
         {
             var hmacKey = new byte[hmacKeyLength];
 
-            using (var sha512 = new SHA512Managed())
+            using (var sha512 = SHA512.Create())
             {
                 hmacKey = sha512.ComputeHash(Key);
             }

common/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -10,10 +10,6 @@
     <NoWarn>1701;1702;NU1701;</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="UAParser" Version="3.1.44" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\web\ASC.Web.Core\ASC.Web.Core.csproj" />
     <ProjectReference Include="..\ASC.Data.Storage\ASC.Data.Storage.csproj" />

common/ASC.Data.Storage/ASC.Data.Storage.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
@@ -42,9 +42,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.5" />
+    <PackageReference Include="openstack.net" Version="1.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.5" />
-    <PackageReference Include="openstack.net" Version="1.7.9" />
   </ItemGroup>
 
   <ItemGroup>

common/ASC.Data.Storage/DiscStorage/DiscDataHandler.cs

@@ -83,7 +83,6 @@ namespace ASC.Data.Storage.DiscStorage
                     {
                         await context.Response.SendFileAsync(path);
                     }
-
                     context.Response.ContentType = MimeMapping.GetMimeMapping(path);
                     //TODO
                     //context.Response.Cache.SetVaryByCustom("*");

common/ASC.Data.Storage/DiscStorage/MappedPath.cs

@@ -25,7 +25,6 @@
 
 
 using System.Collections.Generic;
-using System.IO;
 
 using ASC.Common.Utils;
 

common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs

@@ -31,7 +31,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
@@ -760,32 +759,17 @@ namespace ASC.Data.Storage.GoogleCloud
 
             var totalBytes = "*";
 
-            var BufferSize = 2 * 4096;
-
             if (chunkLength != defaultChunkSize)
                 totalBytes = Convert.ToString((chunkNumber - 1) * defaultChunkSize + chunkLength);
 
             var contentRangeHeader = string.Format("bytes {0}-{1}/{2}", bytesRangeStart, bytesRangeEnd, totalBytes);
 
-            var request = HttpWebRequest.CreateHttp(uploadUri);
+            var request = new HttpRequestMessage();
-
+            request.RequestUri = new Uri(uploadUri);
-            request.Method = HttpMethod.Put.ToString();
+            request.Method = HttpMethod.Put;
-            request.ContentLength = chunkLength;
             request.Headers.Add("Content-Range", contentRangeHeader);
+            request.Content = new StreamContent(stream);
 
-            using (var rs = request.GetRequestStream())
-            {
-                var buffer = new byte[BufferSize];
-
-                int readed;
-
-                while ((readed = stream.Read(buffer, 0, BufferSize)) != 0)
-                {
-                    rs.Write(buffer, 0, readed);
-                }
-
-                stream.Close();
-            }
 
             long MAX_RETRIES = 100;
             int millisecondsTimeout;
@@ -798,16 +782,15 @@ namespace ASC.Data.Storage.GoogleCloud
 
                 try
                 {
-                    var response = request.GetResponse();
+                    using var httpClient = new HttpClient();
-                    var status = ((HttpWebResponse)response).StatusCode;
+                    using var response = httpClient.Send(request);
+                    var status = response.StatusCode;
 
                     break;
                 }
-                catch (WebException ex)
+                catch (HttpRequestException ex)
                 {
-                    var response = (HttpWebResponse)ex.Response;
+                    var status = (int)ex.StatusCode;
-
-                    var status = (int)response.StatusCode;
 
                     if (status == 408 || status == 500 || status == 502 || status == 503 || status == 504)
                     {

common/ASC.Data.Storage/WebPath.cs

@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 
 using ASC.Common;
 using ASC.Common.Logging;
@@ -237,10 +238,13 @@ namespace ASC.Data.Storage
         {
             try
             {
-                var request = (HttpWebRequest)WebRequest.Create(path);
+                var request = new HttpRequestMessage();
-                request.Method = "HEAD";
+                request.RequestUri = new Uri(path);
-                using var resp = (HttpWebResponse)request.GetResponse();
+                request.Method = HttpMethod.Head;
-                return resp.StatusCode == HttpStatusCode.OK;
+                using var httpClient = new HttpClient();
+                using var response = httpClient.Send(request);
+
+                return response.StatusCode == HttpStatusCode.OK;
             }
             catch (Exception)
             {

common/ASC.FederatedLogin/ASC.FederatedLogin.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <NoWarn>NU1701</NoWarn>
   </PropertyGroup>
 

common/ASC.FederatedLogin/Helpers/RequestHelper.cs

@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
+using System.Net.Http;
 using System.Text;
 
 namespace ASC.FederatedLogin.Helpers
@@ -38,9 +38,13 @@ namespace ASC.FederatedLogin.Helpers
         {
             if (string.IsNullOrEmpty(uri)) throw new ArgumentNullException("uri");
 
-            var request = WebRequest.Create(uri);
+            var request = new HttpRequestMessage();
-            request.Method = method;
+            request.RequestUri = new Uri(uri);
-            request.Timeout = timeout;
+            request.Method = new HttpMethod(method);
+
+            using var httpClient = new HttpClient();
+            httpClient.Timeout = TimeSpan.FromMilliseconds(timeout);
+
             if (headers != null)
             {
                 foreach (var key in headers.Keys)
@@ -49,33 +53,22 @@ namespace ASC.FederatedLogin.Helpers
                 }
             }
 
-
+            var bytes = Encoding.UTF8.GetBytes(body ?? "");
+            if (request.Method != HttpMethod.Get && bytes.Length > 0)
+            {
+                request.Content = new ByteArrayContent(bytes, 0, bytes.Length);
                 if (!string.IsNullOrEmpty(contentType))
                 {
-                request.ContentType = contentType;
+                    request.Headers.Add("Content-Type", contentType);
+                }
             }
 
-            var bytes = Encoding.UTF8.GetBytes(body ?? "");
+            using var response = httpClient.Send(request);
-            if (request.Method != "GET" && bytes.Length > 0)
+            using var stream = response.Content.ReadAsStream();
-            {
-                request.ContentLength = bytes.Length;
-                using var stream = request.GetRequestStream();
-                stream.Write(bytes, 0, bytes.Length);
-            }
-
-            try
-            {
-                using var response = request.GetResponse();
-                using var stream = response.GetResponseStream();
             if (stream == null) return null;
             using var readStream = new StreamReader(stream);
             return readStream.ReadToEnd();
-            }
+
-            catch (WebException)
-            {
-                request.Abort();
-                throw;
-            }
         }
     }
 }

common/ASC.FederatedLogin/Profile/LoginProfile.cs

@@ -373,7 +373,7 @@ namespace ASC.FederatedLogin.Profile
 
         internal void FromTransport(string transportstring)
         {
-            var serialized = Encoding.UTF8.GetString(InstanceCrypto.Decrypt(WebEncoders.Base64UrlDecode(transportstring)));
+            var serialized = InstanceCrypto.Decrypt(WebEncoders.Base64UrlDecode(transportstring));
             FromSerializedString(serialized);
         }
 

common/ASC.Feed/ASC.Feed.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />

common/ASC.IPSecurity/ASC.IPSecurity.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />

common/ASC.MessagingSystem/ASC.MessagingSystem.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />

common/ASC.Notify.Textile/ASC.Notify.Textile.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyTitle>ASC.Notify.Textile</AssemblyTitle>
     <Company>Ascensio System SIA</Company>
     <Product>ASC.Notify.Textile</Product>

common/ASC.Textile/ASC.Textile.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>

common/ASC.VoipService/ASC.VoipService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />

common/ASC.VoipService/Twilio/TwilioResponseHelper.cs

@@ -77,7 +77,7 @@ namespace ASC.VoipService.Twilio
             {
                 if (!string.IsNullOrEmpty(settings.GreetingAudio))
                 {
-                    response.Play(Uri.EscapeUriString(settings.GreetingAudio));
+                    response.Play(Uri.EscapeDataString(settings.GreetingAudio));
                 }
 
                 response.Enqueue(settings.Queue.Name, GetEcho("Enqueue", agent != null), "POST",
@@ -129,7 +129,7 @@ namespace ASC.VoipService.Twilio
             if (!string.IsNullOrEmpty(queue.WaitUrl))
             {
                 var gather = new Gather(method: "POST", action: GetEcho("gatherQueue"));
-                gather.Play(Uri.EscapeUriString(queue.WaitUrl));
+                gather.Play(Uri.EscapeDataString(queue.WaitUrl));
                 response.Gather(gather);
             }
             else
@@ -156,7 +156,7 @@ namespace ASC.VoipService.Twilio
         {
             if (to == "hold")
             {
-                return new VoiceResponse().Play(Uri.EscapeUriString(settings.HoldAudio), 0);
+                return new VoiceResponse().Play(Uri.EscapeDataString(settings.HoldAudio), 0);
             }
 
 
@@ -199,7 +199,7 @@ namespace ASC.VoipService.Twilio
         {
             return string.IsNullOrEmpty(settings.VoiceMail)
                        ? response.Say("")
-                       : response.Play(Uri.EscapeUriString(settings.VoiceMail)).Record(method: "POST", action: GetEcho("voiceMail"), maxLength: 30);
+                       : response.Play(Uri.EscapeDataString(settings.VoiceMail)).Record(method: "POST", action: GetEcho("voiceMail"), maxLength: 30);
         }
 
         public string GetEcho(string action, bool user = true)

common/ASC.Webhooks.Core/ASC.Webhooks.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <DefaultItemExcludes>$(DefaultItemExcludes);</DefaultItemExcludes>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>

common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

common/Tests/ASC.Web.Api.Tests/ASC.Web.Api.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

common/Tests/ASC.Webhooks.Tests/ASC.Webhooks.Tests.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
     <PackageReference Include="Moq" Version="4.14.7" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
   </ItemGroup>
 
   <ItemGroup>   

common/Tests/Frontend.Translations.Tests/Frontend.Translations.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

common/Tools/AutoMigrationCreator/AutoMigrationCreator.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <StartupObject>AutoMigrationCreator.Program</StartupObject>
   </PropertyGroup>
 
@@ -13,11 +13,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\products\ASC.Files\Core\ASC.Files.Core.csproj" />
     <ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
-    <PackageReference Include="Microsoft.Build" Version="16.11.0" />
+    <PackageReference Include="Microsoft.Build" Version="17.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

common/Tools/AutoMigrationCreator/Utils/EFCoreDesignTimeServices.cs

@@ -1,6 +1,9 @@
 using ASC.Core.Common.EF;
 
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations.Design;
+using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AutoMigrationCreator
@@ -12,6 +15,10 @@ namespace AutoMigrationCreator
             var serviceCollection = new ServiceCollection();
             serviceCollection.AddEntityFrameworkDesignTimeServices();
             serviceCollection.AddDbContextDesignTimeServices(context);
+            serviceCollection.AddSingleton<MigrationsCodeGeneratorDependencies>();
+            serviceCollection.AddSingleton<AnnotationCodeGeneratorDependencies>();
+            serviceCollection.AddSingleton<IAnnotationCodeGenerator, AnnotationCodeGenerator>();
+            serviceCollection.AddSingleton(context.GetService<ITypeMappingSource>());
 
             var designTimeServices = serviceCollection.BuildServiceProvider();
 

common/services/ASC.ApiSystem/ASC.ApiSystem.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyTitle>ASC.ApiSystem</AssemblyTitle>
     <Company>Ascensio System SIA</Company>
     <Product>ASC.ApiSystem</Product>
@@ -17,10 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.7" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.ApiSystem/Classes/CommonMethods.cs

@@ -28,7 +28,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -169,17 +170,15 @@ namespace ASC.ApiSystem.Controllers
                 return false;
             }
 
-            var webRequest = (HttpWebRequest)WebRequest.Create(url);
+            var request = new HttpRequestMessage();
-            webRequest.Method = WebRequestMethods.Http.Post;
+            request.Method = HttpMethod.Post;
-            webRequest.Accept = "application/x-www-form-urlencoded";
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/x-www-form-urlencoded"));
-            webRequest.ContentLength = 0;
 
             try
             {
-                using var response = webRequest.GetResponse();
+                using var httpClient = new HttpClient();
-
+                using var response = httpClient.Send(request);
-                using var stream = response.GetResponseStream();
+                using var stream = response.Content.ReadAsStream();
-
                 using var reader = new StreamReader(stream, Encoding.UTF8);
 
                 var result = reader.ReadToEnd();
@@ -306,17 +305,16 @@ namespace ASC.ApiSystem.Controllers
                 var data = string.Format("secret={0}&remoteip={1}&response={2}", Configuration["recaptcha:private-key"], ip, response);
                 var url = Configuration["recaptcha:verify-url"] ?? "https://www.recaptcha.net/recaptcha/api/siteverify";
 
-                var webRequest = (HttpWebRequest)WebRequest.Create(url);
+                var request = new HttpRequestMessage();
-                webRequest.Method = WebRequestMethods.Http.Post;
+                request.RequestUri = new Uri(url);
-                webRequest.ContentType = "application/x-www-form-urlencoded";
+                request.Method = HttpMethod.Post;
-                webRequest.ContentLength = data.Length;
+                request.Content = new StringContent(data, Encoding.UTF8, "application/x-www-form-urlencoded");
-                using (var writer = new StreamWriter(webRequest.GetRequestStream()))
+
-                {
+                using var httpClient = new HttpClient();
-                    writer.Write(data);
+                using var httpClientResponse = httpClient.Send(request);
-                }
+                using var stream = httpClientResponse.Content.ReadAsStream();
+                using var reader = new StreamReader(stream);
 
-                using var webResponse = webRequest.GetResponse();
-                using var reader = new StreamReader(webResponse.GetResponseStream());
                 var resp = reader.ReadToEnd();
                 var resObj = JObject.Parse(resp);
 

common/services/ASC.ApiSystem/Controllers/CalDavController.cs

@@ -26,9 +26,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
 using System.Web;
 
 using ASC.ApiSystem.Classes;
@@ -337,24 +339,19 @@ namespace ASC.ApiSystem.Controllers
 
             Log.Info(string.Format("CalDav: SendToApi: {0}", url));
 
-            var webRequest = (HttpWebRequest)WebRequest.Create(url);
+            var request = new HttpRequestMessage();
-            webRequest.Method = httpMethod;
+            request.RequestUri = new Uri(url);
-            webRequest.Accept = "application/json";
+            request.Method = new HttpMethod(httpMethod);
-            webRequest.ContentType = "application/x-www-form-urlencoded";
+            request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/json"));
-            webRequest.ContentLength = 0;
+
+            using var httpClient = new HttpClient();
 
             if (data != null)
             {
-                webRequest.ContentLength = data.Length;
+                request.Content = new StringContent(data, Encoding.UTF8, "application/x-www-form-urlencoded");
-
-                using var writer = new StreamWriter(webRequest.GetRequestStream());
-
-                writer.Write(data);
             }
 
-            using (webRequest.GetResponse())
+            httpClient.Send(request);
-            {
-            }
         }
 
         #endregion

common/services/ASC.ApiSystem/Program.cs

@@ -46,7 +46,6 @@ namespace ASC.ApiSystem
         public async static Task Main(string[] args)
         {
             var host = CreateHostBuilder(args).Build();
-
             await host.RunAsync();
         }
 

common/services/ASC.ApiSystem/Startup.cs

@@ -24,6 +24,8 @@
 */
 
 
+using System.Text.Json.Serialization;
+
 using ASC.Api.Core;
 using ASC.ApiSystem.Classes;
 using ASC.ApiSystem.Controllers;
@@ -66,7 +68,7 @@ namespace ASC.ApiSystem
                 .AddJsonOptions(options =>
                 {
                     options.JsonSerializerOptions.WriteIndented = false;
-                    options.JsonSerializerOptions.IgnoreNullValues = true;
+                    options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
                 });
 
             services.AddMemoryCache();

common/services/ASC.AuditTrail/ASC.AuditTrail.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

common/services/ASC.ClearEvents/ASC.ClearEvents.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -33,10 +33,9 @@
     <ProjectReference Include="..\..\ASC.Common\ASC.Common.csproj" />
     <ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
     <ProjectReference Include="..\..\ASC.Data.Encryption\ASC.Data.Encryption.csproj" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
 
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
 

common/services/ASC.Data.Backup/ASC.Data.Backup.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -21,6 +21,10 @@
 		</ItemGroup>
 
 	</Target>
+	<ItemGroup>
+	  <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
+	  <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
+	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\..\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj" />
 	</ItemGroup>

common/services/ASC.Data.Storage.Encryption/ASC.Data.Storage.Encryption.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -19,16 +19,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.14.0" />
+    <PackageReference Include="Grpc" Version="2.32.0">
-    <PackageReference Include="Grpc" Version="2.32.0" />
+      <TreatAsUsed>true</TreatAsUsed>
+    </PackageReference>
     <PackageReference Include="Grpc.Tools" Version="2.32.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
-    <PackageReference Include="SharpCompress" Version="0.26.0" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.Data.Storage.Migration/ASC.Data.Storage.Migration.csproj

@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
     <GenerateMvcApplicationPartsAssemblyAttributes>false</GenerateMvcApplicationPartsAssemblyAttributes>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.ElasticSearch/ASC.ElasticSearch.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
     <ProjectGuid>{AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652}</ProjectGuid>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <FileUpgradeFlags />
     <UpgradeBackupLocation />
     <AssemblyTitle>ASC.ElasticSearch</AssemblyTitle>

common/services/ASC.Feed.Aggregator/ASC.Feed.Aggregator.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

common/services/ASC.Notify/ASC.Notify.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -16,9 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.Radicale/ASC.Radicale.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
   </ItemGroup>
   
   <ItemGroup>
@@ -21,8 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -19,9 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
     <PackageReference Include="WebSocketSharpNetStandart" Version="1.0.3-rc12" />
   </ItemGroup>
 

common/services/ASC.SsoAuth.Svc/ASC.SsoAuth.Svc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -19,9 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.Studio.Notify/ASC.Studio.Notify.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
     <GenerateMvcApplicationPartsAssemblyAttributes>false</GenerateMvcApplicationPartsAssemblyAttributes>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -14,9 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.TelegramService/ASC.TelegramService.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -16,10 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
-    <PackageReference Include="Telegram.Bot" Version="15.7.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.Thumbnails.Svc/ASC.Thumbnails.Svc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -25,9 +25,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
   
 </Project>

common/services/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
@@ -16,9 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

common/services/ASC.Webhooks.Service/ASC.Webhooks.Service.csproj

@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <ItemGroup>

products/ASC.CRM/Server/ASC.CRM.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
     <GenerateMvcApplicationPartsAssemblyAttributes>false</GenerateMvcApplicationPartsAssemblyAttributes>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -36,15 +36,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.1.0" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="7.2.0" />
     <PackageReference Include="Grpc.Tools" Version="2.32.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LumenWorksCsvReader" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
-    <PackageReference Include="SharpZipLib" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>

products/ASC.CRM/Server/Api/CasesController.cs

@@ -43,7 +43,6 @@ using ASC.MessagingSystem;
 using ASC.Web.Api.Routing;
 using ASC.Web.Core.Users;
 using ASC.Web.CRM.Services.NotifyService;
-using ASC.Web.Files.Services.WCFService;
 
 using AutoMapper;
 

products/ASC.CRM/Server/Api/ReportsController.cs

@@ -35,7 +35,6 @@ using ASC.Core.Common.Settings;
 using ASC.CRM.ApiModels;
 using ASC.CRM.Core;
 using ASC.CRM.Core.Dao;
-using ASC.CRM.Core.Enums;
 using ASC.Web.Api.Routing;
 using ASC.Web.CRM.Classes;
 using ASC.Web.Files.Services.DocumentService;

products/ASC.CRM/Server/Api/TasksController.cs

@@ -20,6 +20,7 @@ using AutoMapper;
 
 using Microsoft.AspNetCore.Mvc;
 
+
 namespace ASC.CRM.Api
 {
     public class TasksController : BaseApiController

products/ASC.CRM/Server/Api/UtilsController.cs

@@ -36,7 +36,6 @@ using ASC.Core.Common.Settings;
 using ASC.CRM.ApiModels;
 using ASC.CRM.Core;
 using ASC.CRM.Core.Dao;
-using ASC.CRM.Core.EF;
 using ASC.CRM.Core.Entities;
 using ASC.CRM.Core.Enums;
 using ASC.CRM.Resources;

products/ASC.CRM/Server/ApiModels/RequestsDto/AddTagToBatchCasesRequestDto.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Mvc;
 
 namespace ASC.CRM.ApiModels
 {

products/ASC.CRM/Server/ApiModels/RequestsDto/AddTagToBatchContactsRequestDto.cs

@@ -1,13 +1,8 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 using ASC.Api.Core;
 using ASC.CRM.Core.Enums;
 
-using Microsoft.AspNetCore.Mvc;
-
 namespace ASC.CRM.ApiModels
 {
     public class AddTagToBatchContactsRequestDto

products/ASC.CRM/Server/ApiModels/RequestsDto/AddTagToBatchDealsRequestDto.cs

@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 using ASC.Api.Core;
 using ASC.CRM.Core.Enums;
 
-using Microsoft.AspNetCore.Mvc;
-
 namespace ASC.CRM.ApiModels
 {
     public class AddTagToBatchDealsRequestDto

products/ASC.CRM/Server/ApiModels/RequestsDto/AddTagToBatchRequestDto.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Mvc;
 
 namespace ASC.CRM.ApiModels
 {

products/ASC.CRM/Server/ApiModels/RequestsDto/CreateContactInfoRequestDto.cs

@@ -1,12 +1,6 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
 using ASC.CRM.Core.Enums;
 
-using Microsoft.AspNetCore.Mvc;
-
 namespace ASC.CRM.ApiModels
 {
     public class CreateContactInfoRequestDto

products/ASC.CRM/Server/ApiModels/RequestsDto/CreateCurrencyRateRequestDto.cs

@@ -1,11 +1,4 @@
-using System;
+namespace ASC.CRM.ApiModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Mvc;
-
-namespace ASC.CRM.ApiModels
 {
     public class CreateCurrencyRateRequestDto
     {

products/ASC.CRM/Server/ApiModels/RequestsDto/CreateInvoiceConverterDataRequestDto.cs

@@ -1,11 +1,4 @@
-using System;
+namespace ASC.CRM.ApiModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Mvc;
-
-namespace ASC.CRM.ApiModels
 {
     public class CreateInvoiceConverterDataRequestDto
     {

products/ASC.CRM/Server/ApiModels/RequestsDto/CreateListItemCategoryRequestDto.cs

@@ -1,11 +1,4 @@
-using System;
+namespace ASC.CRM.ApiModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Mvc;
-
-namespace ASC.CRM.ApiModels
 {
     public class CreateListItemCategoryRequestDto
     {

products/ASC.CRM/Server/ApiModels/RequestsDto/CreateMakeCallRequestDto.cs

@@ -1,11 +1,4 @@
-using System;
+namespace ASC.CRM.ApiModels
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.AspNetCore.Mvc;
-
-namespace ASC.CRM.ApiModels
 {
     public class CreateMakeCallRequestDto
     {