Merge proces, enable signing of the assembly.

This commit is contained in:
Christian Kratky
2017-11-25 19:55:26 +01:00
parent ebfc6aab6b
commit f9d67e2cd2
153 changed files with 323 additions and 383 deletions
@@ -1,8 +1,7 @@
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using MQTTnet.Core;
using MQTTnet.Core.Server;
using MQTTnet.Server;
using Newtonsoft.Json;
namespace MQTTnet.TestApp.UniversalWindows
@@ -131,10 +131,6 @@
<Project>{3587e506-55a2-4eb3-99c7-dc01e42d25d2}</Project>
<Name>MQTTnet.NetStandard</Name>
</ProjectReference>
<ProjectReference Include="..\..\MQTTnet.Core\MQTTnet.Core.csproj">
<Project>{2ecb99e4-72d0-4c23-99ba-93d511d3967d}</Project>
<Name>MQTTnet.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
@@ -5,13 +5,12 @@ using System.Threading.Tasks;
using Windows.Security.Cryptography.Certificates;
using Windows.UI.Core;
using Windows.UI.Xaml;
using MQTTnet.Core;
using MQTTnet.Core.Client;
using MQTTnet.Core.Diagnostics;
using MQTTnet.Core.ManagedClient;
using MQTTnet.Core.Protocol;
using MQTTnet.Core.Server;
using MQTTnet.Client;
using MQTTnet.Diagnostics;
using MQTTnet.Implementations;
using MQTTnet.ManagedClient;
using MQTTnet.Protocol;
using MQTTnet.Server;
namespace MQTTnet.TestApp.UniversalWindows
{
@@ -26,7 +25,7 @@ namespace MQTTnet.TestApp.UniversalWindows
{
InitializeComponent();
MqttNetGlobalLog.LogMessagePublished += OnTraceMessagePublished;
MqttNetGlobalLogger.LogMessagePublished += OnTraceMessagePublished;
}
private async void OnTraceMessagePublished(object sender, MqttNetLogMessagePublishedEventArgs e)
@@ -250,7 +249,7 @@ namespace MQTTnet.TestApp.UniversalWindows
{
{
// Write all trace messages to the console window.
MqttNetGlobalLog.LogMessagePublished += (s, e) =>
MqttNetGlobalLogger.LogMessagePublished += (s, e) =>
{
Console.WriteLine($">> [{e.TraceMessage.Timestamp:O}] [{e.TraceMessage.ThreadId}] [{e.TraceMessage.Source}] [{e.TraceMessage.Level}]: {e.TraceMessage.Message}");
if (e.TraceMessage.Exception != null)