Merge branch 'master' of ssh://lserver1/srv/git/karmabot

This commit is contained in:
Nikolay Kochulin 2019-03-14 12:17:16 +03:00
commit 2cd40cb85d

View File

@ -8,17 +8,20 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="12.0.1"/> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4"/> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
<PackageReference Include="Telegram.Bot" Version="14.10.0"/> <PackageReference Include="Telegram.Bot" Version="14.10.0" />
<PackageReference Include="NLog" Version="5.0.0-beta11"/> <PackageReference Include="NLog" Version="5.0.0-beta11" />
<PackageReference Include="NLog.Config" Version="4.5.11"/> <PackageReference Include="NLog.Config" Version="4.5.11" />
<ProjectReference Include="..\perfusion\Perfusion\Perfusion.csproj"/> <ProjectReference Include="..\perfusion\Perfusion\Perfusion.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="karma.cfg.json"> <None Update="karma.cfg.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="lang\be-BY.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="lang\en-US.json"> <None Update="lang\en-US.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>