Merge branch 'master' into feature/Wizard

# Conflicts:
#	web/ASC.Web.Common/src/api/settings/index.js

ASC.Web.sln

@@ -66,7 +66,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Graph.Core", "thi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OneDrive.Sdk", "thirdparty\onedrive-sdk-csharp-master\src\OneDriveSdk\Microsoft.OneDrive.Sdk.csproj", "{D78506D2-CC97-4063-A800-B16F5A063DE9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Files.Core", "products\ASC.Files\Core\ASC.Files.Core\ASC.Files.Core.csproj", "{68D4947D-F301-4207-A7B2-4949DDD365F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Files.Core", "products\ASC.Files\Core\ASC.Files.Core.csproj", "{F0A39728-940D-4DBE-A37A-05D4EB57F342}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -194,10 +194,10 @@ Global
 		{D78506D2-CC97-4063-A800-B16F5A063DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D78506D2-CC97-4063-A800-B16F5A063DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D78506D2-CC97-4063-A800-B16F5A063DE9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68D4947D-F301-4207-A7B2-4949DDD365F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68D4947D-F301-4207-A7B2-4949DDD365F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68D4947D-F301-4207-A7B2-4949DDD365F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68D4947D-F301-4207-A7B2-4949DDD365F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0A39728-940D-4DBE-A37A-05D4EB57F342}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -25,7 +25,7 @@
 	  <PackageReference Include="SharpCompress" Version="0.25.0" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\products\ASC.Files\Core\ASC.Files.Core\ASC.Files.Core.csproj" />
+	  <ProjectReference Include="..\..\..\products\ASC.Files\Core\ASC.Files.Core.csproj" />
 	  <ProjectReference Include="..\..\..\web\ASC.Web.Core\ASC.Web.Core.csproj" />
 	  <ProjectReference Include="..\..\ASC.Common\ASC.Common.csproj" />
 	  <ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />

products/ASC.Files/Core/ASC.Files.Core.csproj

@@ -31,16 +31,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\common\ASC.Api.Core\ASC.Api.Core.csproj" />
-    <ProjectReference Include="..\..\..\..\common\ASC.Common\ASC.Common.csproj" />
-    <ProjectReference Include="..\..\..\..\common\ASC.Core.Common\ASC.Core.Common.csproj" />
-    <ProjectReference Include="..\..\..\..\common\ASC.Data.Storage\ASC.Data.Storage.csproj" />
-    <ProjectReference Include="..\..\..\..\common\ASC.FederatedLogin\ASC.FederatedLogin.csproj" />
-    <ProjectReference Include="..\..\..\..\common\ASC.MessagingSystem\ASC.MessagingSystem.csproj" />
-    <ProjectReference Include="..\..\..\..\common\services\ASC.ElasticSearch\ASC.ElasticSearch.csproj" />
-    <ProjectReference Include="..\..\..\..\thirdparty\AppLimit.CloudComputing.SharpBox\AppLimit.CloudComputing.SharpBox.csproj" />
-    <ProjectReference Include="..\..\..\..\thirdparty\onedrive-sdk-csharp-master\src\OneDriveSdk\Microsoft.OneDrive.Sdk.csproj" />
-    <ProjectReference Include="..\..\..\..\web\ASC.Web.Core\ASC.Web.Core.csproj" />
+    <ProjectReference Include="..\..\..\common\ASC.Api.Core\ASC.Api.Core.csproj" />
+    <ProjectReference Include="..\..\..\common\ASC.Common\ASC.Common.csproj" />
+    <ProjectReference Include="..\..\..\common\ASC.Core.Common\ASC.Core.Common.csproj" />
+    <ProjectReference Include="..\..\..\common\ASC.Data.Storage\ASC.Data.Storage.csproj" />
+    <ProjectReference Include="..\..\..\common\ASC.FederatedLogin\ASC.FederatedLogin.csproj" />
+    <ProjectReference Include="..\..\..\common\ASC.MessagingSystem\ASC.MessagingSystem.csproj" />
+    <ProjectReference Include="..\..\..\common\services\ASC.ElasticSearch\ASC.ElasticSearch.csproj" />
+    <ProjectReference Include="..\..\..\thirdparty\AppLimit.CloudComputing.SharpBox\AppLimit.CloudComputing.SharpBox.csproj" />
+    <ProjectReference Include="..\..\..\thirdparty\onedrive-sdk-csharp-master\src\OneDriveSdk\Microsoft.OneDrive.Sdk.csproj" />
+    <ProjectReference Include="..\..\..\web\ASC.Web.Core\ASC.Web.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>