kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/development' into development

Browse Source 
# Conflicts:
#	TelegramBotBase.Test/packages.config
#	TelegramBotBase/Form/CallbackData.cs
#	TelegramBotBase/TelegramBotBase.nuspec
This commit is contained in:
ZavaruKitsu 2023-01-04 15:57:29 +03:00
commit c3c7d8f0c4
4 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/SystemCommandsBot/SystemCommandsBot.csproj
View File

@ -11,4 +11,4 @@
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/> <ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
TelegramBotBase.Test/packages.config Normal file
View File

@ -0,0 +1 @@


4
TelegramBotBase/Form/CallbackData.cs
View File

@ -64,4 +64,6 @@ public class CallbackData
return null; return null;
} }
}
public static implicit operator string(CallbackData callbackData) => callbackData.Serialize();
}

50
TelegramBotBase/TelegramBotBase.nuspec
View File

@ -1,29 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata> <metadata>
<id>TelegramBotBase</id> <id>TelegramBotBase</id>
<version>2.1.0</version> <version>2.1.0</version>
<authors>TelegramBotBase</authors> <authors>TelegramBotBase</authors>
<owners>TelegramBotBase</owners> <owners>TelegramBotBase</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license> <license type="expression">MIT</license>
<projectUrl>https://github.com/MajMcCloud/TelegramBotFramework</projectUrl> <projectUrl>https://github.com/MajMcCloud/TelegramBotFramework</projectUrl>
<description>Package Description</description> <description>Package Description</description>
<releaseNotes>- moving from .Net Framework 4.7.2 to .Net Standard 2.1 for the Library and .Net Core 3.0 for the <releaseNotes>- moving from .Net Framework 4.7.2 to .Net Standard 2.1 for the Library and .Net Core 3.0 for the test project!</releaseNotes>
test project! <repository url="https://github.com/MajMcCloud/TelegramBotFramework" />
</releaseNotes> <dependencies>
<repository url="https://github.com/MajMcCloud/TelegramBotFramework"/> <group targetFramework=".NETFramework4.6.1">
<dependencies> <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<group targetFramework=".NETFramework4.6.1"> <dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="12.0.2" exclude="Build,Analyzers"/> <dependency id="Telegram.Bot" version="15.0.0" exclude="Build,Analyzers" />
<dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers"/> </group>
<dependency id="Telegram.Bot" version="15.0.0" exclude="Build,Analyzers"/> <group targetFramework=".NETStandard2.0">
</group> <dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<group targetFramework=".NETStandard2.0"> <dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="12.0.2" exclude="Build,Analyzers"/> <dependency id="Telegram.Bot" version="15.0.0" exclude="Build,Analyzers" />
<dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers"/> </group>
<dependency id="Telegram.Bot" version="15.0.0" exclude="Build,Analyzers"/> </dependencies>
</group> </metadata>
</dependencies>
</metadata>
</package> </package>