IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/files

Browse Source
This commit is contained in:
Ilya Oleshko 2020-06-05 14:25:54 +03:00
commit be6b6eb3ad
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Server/Services/WCFService/FileOperations/FileConflictResolveType.cs
View File

@ -25,10 +25,12 @@
using System.Runtime.Serialization;
using System.Text.Json.Serialization;
namespace ASC.Web.Files.Services.WCFService.FileOperations
{
[DataContract]
[JsonConverter(typeof(JsonStringEnumConverter))]
public enum FileConflictResolveType
{
[EnumMember] Skip = 0,

2
products/ASC.Files/Server/Startup.cs
View File

@ -1,6 +1,5 @@
using System.Text;
using System.Text.Json.Serialization;
using ASC.Api.Core;
using ASC.Api.Core.Auth;
@ -52,7 +51,6 @@ namespace ASC.Files
options.JsonSerializerOptions.IgnoreNullValues = true;
options.JsonSerializerOptions.Converters.Add(new ApiDateTimeConverter());
options.JsonSerializerOptions.Converters.Add(new FileEntryWrapperConverter());
options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
});
services.AddMemoryCache();

2
products/ASC.People/Server/Startup.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Text.Json.Serialization;
using ASC.Api.Core;
using ASC.Api.Core.Auth;
@ -51,7 +50,6 @@ namespace ASC.People
options.JsonSerializerOptions.WriteIndented = false;
options.JsonSerializerOptions.IgnoreNullValues = true;
options.JsonSerializerOptions.Converters.Add(new ApiDateTimeConverter());
options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
});
services.AddAuthentication("cookie")

2
web/ASC.Web.Api/Startup.cs
View File

@ -1,4 +1,3 @@
using System.Text.Json.Serialization;
using ASC.Api.Core;
using ASC.Api.Core.Auth;
@ -46,7 +45,6 @@ namespace ASC.Web.Api
options.JsonSerializerOptions.WriteIndented = false;
options.JsonSerializerOptions.IgnoreNullValues = true;
options.JsonSerializerOptions.Converters.Add(new ApiDateTimeConverter());
options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter());
});
services.AddAuthentication("cookie")