Merge pull request #46 from MajMcCloud/development
Migrate development to master
This commit is contained in:
commit
91e0c54728
@ -15,10 +15,7 @@
|
|||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
||||||
</ItemGroup>
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -16,15 +16,12 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0"/>
|
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0" />
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
|
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj"/>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@ -11,7 +11,7 @@ namespace TelegramBotBase.Example.Tests.Controls;
|
|||||||
public class LabelForm : AutoCleanForm
|
public class LabelForm : AutoCleanForm
|
||||||
{
|
{
|
||||||
|
|
||||||
TelegramBotBase.Controls.Inline.LabelControl _label;
|
TelegramBotBase.Controls.Inline.Label _label;
|
||||||
|
|
||||||
ButtonGrid _buttonGrid;
|
ButtonGrid _buttonGrid;
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ public class LabelForm : AutoCleanForm
|
|||||||
private Task LabelForm_Init(object sender, InitEventArgs e)
|
private Task LabelForm_Init(object sender, InitEventArgs e)
|
||||||
{
|
{
|
||||||
//The "label" control
|
//The "label" control
|
||||||
_label = new LabelControl("My test label");
|
_label = new Label("My test label");
|
||||||
|
|
||||||
AddControl(_label);
|
AddControl(_label);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user