Skip to content

.Net Core/5 support #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RandallFlagg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

.Net Core/5 support #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a53eab
Added .NET Standard 2.1 project files
OAGNovidea Dec 18, 2020
933d231
Fixed tabs and spaces
OAGNovidea Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/TgSharp.Core/FileSessionStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System.IO;

using TgSharp.TL;
using TgSharp.Core.MTProto;
using TgSharp.Core.MTProto.Crypto;
using TgSharp.TL;

namespace TgSharp.Core
{
Expand Down
15 changes: 9 additions & 6 deletions src/TgSharp.Core/Network/MtProtoSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;

using TgSharp.TL;
using TgSharp.Core.Exceptions;
using TgSharp.Core.MTProto;
using TgSharp.Core.MTProto.Crypto;
using TgSharp.Core.Network.Exceptions;
using TgSharp.Core.Network.Requests;
using TgSharp.Core.Utils;
using TgSharp.TL;

namespace TgSharp.Core.Network
{
Expand All @@ -37,10 +36,14 @@ public MtProtoSender(TcpTransport transport, ISessionStore sessionStore, Session

private int GenerateSequence(bool confirmed)
{
lock (session.Lock) {
try {
lock (session.Lock)
{
try
{
return confirmed ? session.Sequence++ * 2 + 1 : session.Sequence * 2;
} finally {
}
finally
{
sessionStore.Save(session);
}
}
Expand Down Expand Up @@ -71,7 +74,7 @@ private int GenerateSequence(bool confirmed)
await Send(memory.ToArray(), request, token).ConfigureAwait(false);
}

sessionStore.Save (session);
sessionStore.Save(session);
}

public async Task Send(byte[] packet, TLMethod request, CancellationToken token = default(CancellationToken))
Expand Down
11 changes: 6 additions & 5 deletions src/TgSharp.Core/TgSharp.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<id>TgSharp</id>
<version>0.1</version>
<title>Telegram client library implemented in C#</title>
<authors>Ilya P</authors>
<owners>aarani, knocte</owners>
<authors>Ilya P</authors>
<owners>aarani, knocte</owners>
<projectUrl>https://github.com/nblockchain/TgSharp/</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Unofficial Telegram (http://telegram.org) client library implemented in C#.

It's a perfect fit for any developer who would like to send data directly to Telegram users or write own custom Telegram client.</description>
<description>
Unofficial Telegram (http://telegram.org) client library implemented in C#.
It's a perfect fit for any developer who would like to send data directly to Telegram users or write own custom Telegram client.
</description>
<tags>telegram client, telegram API</tags>
<copyright>Copyright 2015-2020</copyright>
</metadata>
Expand Down
36 changes: 36 additions & 0 deletions src/TgSharp.Core/TgSharp.CoreCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>8.0</LangVersion>
<Authors>Ilya P, RandallFlagg</Authors>
<Owners>aarani, knocte</Owners>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Title>Telegram client library implemented in C# (.NET Standard 2.1)</Title>
<Description>Unofficial Telegram (http://telegram.org) client library implemented in C#.
It's a perfect fit for any developer who would like to send data directly to Telegram users or write own custom Telegram client.
</Description>
<AssemblyVersion>0.1.0.0</AssemblyVersion>
<FileVersion>0.1.0.0</FileVersion>
<Version>0.1.0.0</Version>
<RepositoryUrl>https://github.com/nblockchain/TgSharp/</RepositoryUrl>
<PackageProjectUrl></PackageProjectUrl>
<PackageTags>Telegram</PackageTags>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
<Compile Remove="Requests\AuthSendCodeRequest.cs" />
<Compile Remove="Requests\AuthSignInRequest.cs" />
<Compile Remove="Requests\DownloadFileRequest.cs" />
<Compile Remove="Requests\InitConnectionRequest.cs" />
<Compile Remove="Requests\MTProtoRequest.cs" />
</ItemGroup>

<ItemGroup>
<None Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TgSharp.TL\TgSharp.TLCore.csproj" />
</ItemGroup>
</Project>
33 changes: 33 additions & 0 deletions src/TgSharp.TL/TgSharp.TLCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>8.0</LangVersion>
<Authors>Ilya P, RandallFlagg</Authors>
<Owners>aarani, knocte</Owners>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Title>Telegram client library implemented in C# (.NET Standard 2.1)</Title>
<Description>Unofficial Telegram (http://telegram.org) client library implemented in C#.
It's a perfect fit for any developer who would like to send data directly to Telegram users or write own custom Telegram client.
</Description>
<AssemblyVersion>0.1.0.0</AssemblyVersion>
<FileVersion>0.1.0.0</FileVersion>
<Version>0.1.0.0</Version>
<RepositoryUrl>https://github.com/nblockchain/TgSharp/</RepositoryUrl>
<PackageProjectUrl></PackageProjectUrl>
<PackageTags>Telegram</PackageTags>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Properties\AssemblyInfo.cs" />
<Compile Remove="Requests\AuthSendCodeRequest.cs" />
<Compile Remove="Requests\AuthSignInRequest.cs" />
<Compile Remove="Requests\DownloadFileRequest.cs" />
<Compile Remove="Requests\InitConnectionRequest.cs" />
<Compile Remove="Requests\MTProtoRequest.cs" />
</ItemGroup>

<ItemGroup>
<None Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
</Project>