HomeAssistant
/
hass-workstation-service
mirror of https://github.com/sleevezipper/hass-workstation-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump mqtt.net and avalonia to latest

Browse Source
pull/56/head
sleevezipper 4 years ago
parent bbf23a04c6
commit 70705578d5
8 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File

3
UserInterface/Program.cs
Unescape View File

@ -1,6 +1,5 @@
using Avalonia; using Avalonia;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Logging.Serilog;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using System; using System;
@ -18,7 +17,7 @@ namespace UserInterface
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>() => AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.LogToDebug() .LogToTrace()
.UseReactiveUI(); .UseReactiveUI();
} }

10
UserInterface/UserInterface.csproj
Unescape View File

@ -11,11 +11,11 @@
<None Remove="Assets\hass-workstation-logo.ico" /> <None Remove="Assets\hass-workstation-logo.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="0.9.12" /> <PackageReference Include="Avalonia" Version="0.10.0" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.9.12" /> <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.0" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.12" /> <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
<PackageReference Include="Avalonia.Win32" Version="0.9.12" /> <PackageReference Include="Avalonia.Win32" Version="0.10.0" />
<PackageReference Include="JKang.IpcServiceFramework.Client.NamedPipe" Version="3.1.0" /> <PackageReference Include="JKang.IpcServiceFramework.Client.NamedPipe" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
</ItemGroup> </ItemGroup>

3
UserInterface/Views/AddCommandDialog.axaml.cs
Unescape View File

@ -23,9 +23,6 @@ namespace UserInterface.Views
public AddCommandDialog() public AddCommandDialog()
{ {
this.InitializeComponent(); this.InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
DataContext = new AddCommandViewModel(); DataContext = new AddCommandViewModel();
this.comboBox = this.FindControl<ComboBox>("ComboBox"); this.comboBox = this.FindControl<ComboBox>("ComboBox");
this.comboBox.Items = Enum.GetValues(typeof(AvailableCommands)).Cast<AvailableCommands>().OrderBy(v => v.ToString()); this.comboBox.Items = Enum.GetValues(typeof(AvailableCommands)).Cast<AvailableCommands>().OrderBy(v => v.ToString());

3
UserInterface/Views/AddSensorDialog.axaml.cs
Unescape View File

@ -23,9 +23,6 @@ namespace UserInterface.Views
public AddSensorDialog() public AddSensorDialog()
{ {
this.InitializeComponent(); this.InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
DataContext = new AddSensorViewModel(); DataContext = new AddSensorViewModel();
this.comboBox = this.FindControl<ComboBox>("ComboBox"); this.comboBox = this.FindControl<ComboBox>("ComboBox");
this.comboBox.Items = Enum.GetValues(typeof(AvailableSensors)).Cast<AvailableSensors>().OrderBy(v => v.ToString()); this.comboBox.Items = Enum.GetValues(typeof(AvailableSensors)).Cast<AvailableSensors>().OrderBy(v => v.ToString());

4
UserInterface/Views/MainWindow.axaml.cs
Unescape View File

@ -10,9 +10,7 @@ namespace UserInterface.Views
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
WindowsTrayIcon icon = new WindowsTrayIcon(); WindowsTrayIcon icon = new WindowsTrayIcon();
} }

2
hass-workstation-service/Communication/MQTT/MqttPublisher.cs
Unescape View File

@ -80,7 +80,7 @@ namespace hass_workstation_service.Communication
// configure what happens on disconnect // configure what happens on disconnect
this._mqttClient.UseDisconnectedHandler(e => this._mqttClient.UseDisconnectedHandler(e =>
{ {
this._mqttClientMessage = e.ReasonCode.ToString(); this._mqttClientMessage = e.Reason.ToString();
}); });
} }

1
hass-workstation-service/Data/ConfigurationService.cs
Unescape View File

@ -226,6 +226,7 @@ namespace hass_workstation_service.Data
.WithTls(new MqttClientOptionsBuilderTlsParameters() .WithTls(new MqttClientOptionsBuilderTlsParameters()
{ {
UseTls = configuredBroker.UseTLS, UseTls = configuredBroker.UseTLS,
SslProtocol = System.Security.Authentication.SslProtocols.Tls12,
AllowUntrustedCertificates = true AllowUntrustedCertificates = true
}) })
.WithCredentials(configuredBroker.Username, configuredBroker.Password.ToString()) .WithCredentials(configuredBroker.Username, configuredBroker.Password.ToString())

4
hass-workstation-service/hass-workstation-service.csproj
Unescape View File

@ -46,8 +46,8 @@
<PackageReference Include="LibreHardwareMonitorLib" Version="0.8.7" /> <PackageReference Include="LibreHardwareMonitorLib" Version="0.8.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="MQTTnet" Version="3.0.13" /> <PackageReference Include="MQTTnet" Version="3.0.15" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.13" /> <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.15" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" /> <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" /> <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />

Write Preview
Loading…
Cancel
Save