IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ac8293d7f7
DocSpace-client/web/ASC.Web.Api/ASC.Web.Api.csproj

125 lines
5.6 KiB
XML
Raw Normal View History

Resources: fixed projects
2022-05-12 15:32:39 +00:00
<?xml version="1.0" encoding="utf-8"?>
Merge branch 'release/v1.2' into develop # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs # common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj # common/ASC.Data.Storage/S3/S3Storage.cs # common/ASC.FederatedLogin/OAuth20Token.cs # common/ASC.Notify.Textile/ASC.Notify.Textile.csproj # common/ASC.Resource.Manager/Program.cs # common/services/ASC.AuditTrail/ASC.AuditTrail.csproj # config/appsettings.json # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Security/ISecurityDao.cs # products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs # products/ASC.Files/Core/Core/ThumbnailSettings.cs # products/ASC.Files/Core/Helpers/Global.cs # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs # products/ASC.Files/Core/Model/SessionModel.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs # products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs # products/ASC.Files/Core/ThirdPartyApp/Token.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Core/Utils/FileMarker.cs # products/ASC.Files/Core/Utils/FileUploader.cs # products/ASC.Files/Core/Utils/SocketManager.cs # products/ASC.Files/Server/Controllers/FilesController.cs # products/ASC.Files/Server/DocStore # products/ASC.Files/Server/Helpers/FilesControllerHelper.cs # products/ASC.Files/Server/Startup.cs # products/ASC.Files/Service/Thumbnail/Builder.cs # products/ASC.Files/Service/Thumbnail/Worker.cs # products/ASC.People/Server/ASC.People.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs # web/ASC.Web.Core/PublicResources/Resource.Designer.cs # web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs # web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx # web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs # web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 19:44:48 +00:00
<Project Sdk="Microsoft.NET.Sdk.Web">
init commit
2019-05-15 14:56:09 +00:00
<PropertyGroup>
net6
2021-08-25 15:26:13 +00:00
<TargetFramework>net6.0</TargetFramework>
Upgrade .net core to 3.0.0-preview6 Added KafkaCache
2019-07-19 13:10:15 +00:00
<AssemblyTitle>ASC.Web.Api</AssemblyTitle>
<Company>Ascensio System SIA</Company>
<Product>ASC.Web.Api</Product>
<Copyright>(c) Ascensio System SIA. All rights reserved</Copyright>
RazorCompileOnBuild:false< GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 17:08:26 +00:00
<RazorCompileOnBuild>false</RazorCompileOnBuild>
<GenerateMvcApplicationPartsAssemblyAttributes>false</GenerateMvcApplicationPartsAssemblyAttributes>
Added solution filter Removed unused services replaced sh with bat start service from source
2021-10-25 11:29:36 +00:00
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
ImplicitUsings
2022-03-01 11:44:13 +00:00
<ImplicitUsings>enable</ImplicitUsings>
init commit
2019-05-15 14:56:09 +00:00
</PropertyGroup>
csproj: remove pdb file from release build configuration
2019-09-10 13:38:20 +00:00
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType>
Api: release config
2021-08-19 14:36:13 +00:00
<Optimize>true</Optimize>
csproj: remove pdb file from release build configuration
2019-09-10 13:38:20 +00:00
</PropertyGroup>
refactoring: asc.web.api
2022-03-01 10:58:02 +00:00
<ItemGroup>
<Compile Remove="Api\LdapController.cs" />
<Compile Remove="Api\SsoSettingsV2Controller.cs" />
</ItemGroup>
Api: payment/tariff method
2022-08-30 08:39:43 +00:00
<ItemGroup>
<None Remove="img\audit.svg" />
<None Remove="img\backup.svg" />
<None Remove="img\restore.svg" />
<None Remove="img\room.svg" />
<None Remove="img\sso.svg" />
<None Remove="img\total_size.svg" />
<None Remove="img\users.svg" />
<None Remove="img\whitelabel.svg" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="img\audit.svg" />
<EmbeddedResource Include="img\restore.svg" />
<EmbeddedResource Include="img\room.svg" />
<EmbeddedResource Include="img\sso.svg" />
<EmbeddedResource Include="img\total_size.svg" />
<EmbeddedResource Include="img\users.svg" />
<EmbeddedResource Include="img\whitelabel.svg" />
</ItemGroup>
Added autofac and nlog
2019-05-28 15:05:20 +00:00
<ItemGroup>
Systemd package moved to shared ASC.Api.Core
2022-03-21 13:40:09 +00:00
<ProjectReference Include="..\..\common\ASC.Api.Core\ASC.Api.Core.csproj" />
fix
2022-03-14 09:02:43 +00:00
<ProjectReference Include="..\..\common\ASC.ActiveDirectory\ASC.ActiveDirectory.csproj" />
Added autofac and nlog
2019-05-28 15:05:20 +00:00
<ProjectReference Include="..\..\common\ASC.Core.Common\ASC.Core.Common.csproj" />
backup.core: move backup.core
2021-09-02 12:41:54 +00:00
<ProjectReference Include="..\..\common\ASC.Data.Backup.Core\ASC.Data.Backup.Core.csproj" />
Web.Api: added feed api
2022-09-01 15:22:40 +00:00
<ProjectReference Include="..\..\common\ASC.Feed\ASC.Feed.csproj" />
ASC.AuditTrail: first version
2020-10-06 07:06:05 +00:00
<ProjectReference Include="..\..\common\services\ASC.AuditTrail\ASC.AuditTrail.csproj" />
Replace Singletons with DI. Added support for working with db. Added first version of CookieAuthHandler. Added PeopleController for test auth.
2019-05-17 08:32:23 +00:00
</ItemGroup>
Auth by thirdparty
2021-02-19 16:16:08 +00:00
<ItemGroup>
<Compile Update="Core\AuditResource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>AuditResource.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Core\AuditResource.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>AuditResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.ru.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.de.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.es.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.fr.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.it.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
Resources: fixed projects
2022-05-12 15:32:39 +00:00
<EmbeddedResource Update="Core\AuditResource.bg.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.cs.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.el.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.fi.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.ja.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.lv.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.nl.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.pl.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.pt-BR.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.sk.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.sl.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.tr.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.uk.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.vi.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Core\AuditResource.zh-CN.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
az resources
2022-06-27 11:00:23 +00:00
<EmbeddedResource Update="Core\AuditResource.az.resx">
<DependentUpon>AuditResource.resx</DependentUpon>
</EmbeddedResource>
Auth by thirdparty
2021-02-19 16:16:08 +00:00
</ItemGroup>
Resources: fixed projects
2022-05-12 15:32:39 +00:00
</Project>
Reference in New Issue Copy Permalink