IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74715f3f47
DocSpace-client/common/ASC.Notify.Textile/ASC.Notify.Textile.csproj

100 lines
4.8 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">
Added ASC.Notify.Textile
2019-08-19 13:51:36 +00:00
<PropertyGroup>
net6
2021-08-25 15:26:13 +00:00
<TargetFramework>net6.0</TargetFramework>
Added ASC.Notify.Textile
2019-08-19 13:51:36 +00:00
<AssemblyTitle>ASC.Notify.Textile</AssemblyTitle>
<Company>Ascensio System SIA</Company>
<Product>ASC.Notify.Textile</Product>
<Copyright>(c) Ascensio System SIA. All rights reserved</Copyright>
fixed run via vs
2021-08-23 12:55:19 +00:00
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
Csproj: ImplicitUsings
2022-03-05 08:20:05 +00:00
<ImplicitUsings>enable</ImplicitUsings>
Added ASC.Notify.Textile
2019-08-19 13:51:36 +00:00
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
</PropertyGroup>
Notify: fixed textile
2019-09-25 14:25:28 +00:00
<ItemGroup>
<EmbeddedResource Include="Resources\master.htm" />
<EmbeddedResource Include="Resources\style.css" />
</ItemGroup>
Added ASC.Notify.Textile
2019-08-19 13:51:36 +00:00
<ItemGroup>
<ProjectReference Include="..\ASC.Common\ASC.Common.csproj" />
<ProjectReference Include="..\ASC.Core.Common\ASC.Core.Common.csproj" />
<ProjectReference Include="..\ASC.Textile\ASC.Textile.csproj" />
</ItemGroup>
NotifyTemplateResource
2019-08-19 15:48:49 +00:00
<ItemGroup>
<Compile Update="Resources\NotifyTemplateResource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Resources\NotifyTemplateResource.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>NotifyTemplateResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.ru.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.de.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.es.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.fr.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.it.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
Resources: fixed projects
2022-05-12 15:32:39 +00:00
<EmbeddedResource Update="Resources\NotifyTemplateResource.bg.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.cs.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.el.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.fi.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.ja.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.lv.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.nl.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.pl.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.pt-BR.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.sk.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.tr.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.uk.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.vi.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="Resources\NotifyTemplateResource.zh-CN.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
az resources
2022-06-27 11:00:23 +00:00
<EmbeddedResource Update="Resources\NotifyTemplateResource.az.resx">
<DependentUpon>NotifyTemplateResource.resx</DependentUpon>
</EmbeddedResource>
NotifyTemplateResource
2019-08-19 15:48:49 +00:00
</ItemGroup>
Added ASC.Notify.Textile
2019-08-19 13:51:36 +00:00
</Project>
Reference in New Issue Copy Permalink