pavelbannov
e2cee2c2fc
# 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
55 lines
2.1 KiB
XML
55 lines
2.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project Sdk="Microsoft.NET.Sdk">
|
|
<PropertyGroup>
|
|
<OutputType>Exe</OutputType>
|
|
<TargetFramework>net6.0</TargetFramework>
|
|
<OutputType>Library</OutputType>
|
|
<NoWarn>NU1701</NoWarn>
|
|
<ImplicitUsings>enable</ImplicitUsings>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<None Remove="protos\backup_progress.proto" />
|
|
<None Remove="protos\delete_schedule.proto" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<PackageReference Include="Grpc" Version="2.45.0">
|
|
<TreatAsUsed>true</TreatAsUsed>
|
|
</PackageReference>
|
|
<PackageReference Include="Grpc.Tools" Version="2.45.0">
|
|
<PrivateAssets>all</PrivateAssets>
|
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
|
</PackageReference>
|
|
<PackageReference Include="MySql.Data" Version="8.0.29" />
|
|
<PackageReference Include="protobuf-net" Version="3.1.4" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\..\products\ASC.Files\Core\ASC.Files.Core.csproj" />
|
|
<ProjectReference Include="..\ASC.Data.Storage\ASC.Data.Storage.csproj" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Protobuf Include="protos\backup_progress.proto" />
|
|
<Protobuf Include="protos\delete_schedule.proto" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Compile Update="BackupResource.Designer.cs">
|
|
<DependentUpon>BackupResource.resx</DependentUpon>
|
|
<DesignTime>True</DesignTime>
|
|
<AutoGen>True</AutoGen>
|
|
</Compile>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<EmbeddedResource Update="BackupResource.resx">
|
|
<LastGenOutput>BackupResource.Designer.cs</LastGenOutput>
|
|
<Generator>ResXFileCodeGenerator</Generator>
|
|
</EmbeddedResource>
|
|
<EmbeddedResource Update="BackupResource.el.resx">
|
|
<DependentUpon>BackupResource.resx</DependentUpon>
|
|
</EmbeddedResource>
|
|
<EmbeddedResource Update="BackupResource.fr.resx">
|
|
<DependentUpon>BackupResource.resx</DependentUpon>
|
|
</EmbeddedResource>
|
|
<EmbeddedResource Update="BackupResource.tr.resx">
|
|
<DependentUpon>BackupResource.resx</DependentUpon>
|
|
</EmbeddedResource>
|
|
</ItemGroup>
|
|
</Project> |