YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-25 15:42:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix breaking changes

Browse Source
This commit is contained in:
Christian Kratky
2017-10-28 10:49:03 +02:00
parent 4a6f517e91
commit 019ef1398e
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frameworks/MQTTnet.UniversalWindows/ServiceCollectionExtensions.cs
+14 -7
View File
@@ -14,20 +14,27 @@ namespace MQTTnet
public static class ServiceCollectionExtensions public static class ServiceCollectionExtensions
{ {
public static IServiceCollection AddMqttServer(this IServiceCollection services) public static IServiceCollection AddMqttServer(this IServiceCollection services)
{
services.AddMqttServerServices();
services.AddSingleton<IMqttServer>(s => s.GetService<MqttServer>());
services.AddSingleton<MqttServer>();
return services;
}
public static IServiceCollection AddMqttServerServices(this IServiceCollection services)
{ {
services.AddOptions(); services.AddOptions();
services.AddSingleton<MqttFactory>(); services.AddSingleton<MqttFactory>();
services.AddSingleton<IMqttCommunicationAdapterFactory, MqttFactory>(); services.AddSingleton<IMqttCommunicationAdapterFactory>(s => s.GetService<MqttFactory>());
services.AddSingleton<IMqttClientSesssionFactory, MqttFactory>(); services.AddSingleton<IMqttClientSesssionFactory>(s => s.GetService<MqttFactory>());
services.AddSingleton<IMqttServer,MqttServer>();
services.AddSingleton<MqttServer>();
services.AddTransient<IMqttServerAdapter, MqttServerAdapter>(); services.AddTransient<IMqttServerAdapter, MqttServerAdapter>();
services.AddTransient<IMqttPacketSerializer, MqttPacketSerializer>(); services.AddTransient<IMqttPacketSerializer, MqttPacketSerializer>();
services.AddTransient<MqttClientSessionsManager>(); services.AddTransient<MqttClientSessionsManager>();
services.AddTransient<MqttClientSubscriptionsManager>();
services.AddTransient<MqttClientRetainedMessagesManager>(); services.AddTransient<MqttClientRetainedMessagesManager>();
return services; return services;
} }
@@ -42,7 +49,7 @@ namespace MQTTnet
public static IServiceCollection AddMqttClient(this IServiceCollection services) public static IServiceCollection AddMqttClient(this IServiceCollection services)
{ {
services.AddSingleton<MqttFactory>(); services.AddSingleton<MqttFactory>();
services.AddSingleton<IMqttCommunicationAdapterFactory, MqttFactory>(); services.AddSingleton<IMqttCommunicationAdapterFactory>(s => s.GetService<MqttFactory>());
services.AddTransient<IMqttClient, MqttClient>(); services.AddTransient<IMqttClient, MqttClient>();
services.AddTransient<MqttClient>(); services.AddTransient<MqttClient>();
Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml
+8 -3
View File
@@ -84,9 +84,14 @@
</StackPanel> </StackPanel>
</PivotItem> </PivotItem>
<PivotItem Header="Server"> <PivotItem Header="Server">
<StackPanel Orientation="Horizontal"> <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Button Width="120" Margin="0,0,10,0" Click="StartServer">Start</Button> <TextBlock>Port:</TextBlock>
<Button Width="120" Margin="0,0,10,0" Click="StopServer">Stop</Button> <TextBox x:Name="ServerPort" Text="1883"></TextBox>
<StackPanel Orientation="Horizontal">
<Button Width="120" Margin="0,0,10,0" Click="StartServer">Start</Button>
<Button Width="120" Margin="0,0,10,0" Click="StopServer">Stop</Button>
</StackPanel>
</StackPanel> </StackPanel>
</PivotItem> </PivotItem>
</Pivot> </Pivot>
Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs
+5 -1
View File
@@ -329,7 +329,11 @@ namespace MQTTnet.TestApp.UniversalWindows
return; return;
} }
_mqttServer = new MqttFactory().CreateMqttServer(); _mqttServer = new MqttFactory().CreateMqttServer(o =>
{
o.DefaultEndpointOptions.Port = int.Parse(ServerPort.Text);
});
await _mqttServer.StartAsync(); await _mqttServer.StartAsync();
} }