diff --git a/Clients/MQTTClient/MQTTClient.csproj b/Clients/MQTTClient/MQTTClient.csproj index e7be0c1731b9d805811958162c60ef7e2fd6020f..cbba7b0d8b43a4cf2563a3e63ddac024a8bca1bf 100644 --- a/Clients/MQTTClient/MQTTClient.csproj +++ b/Clients/MQTTClient/MQTTClient.csproj @@ -6,7 +6,7 @@ - + diff --git a/IoTSharp.Test/IoTSharp.Test.csproj b/IoTSharp.Test/IoTSharp.Test.csproj index bfaf71bfb9eb6d6df63abe7c3d699e7dd786ba87..8c4508068900626251b1bb24d2677956616d323a 100644 --- a/IoTSharp.Test/IoTSharp.Test.csproj +++ b/IoTSharp.Test/IoTSharp.Test.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/IoTSharp/Extensions/MqttExtension.cs b/IoTSharp/Extensions/MqttExtension.cs index ef02f9d758174977bf2311ac7b3fc3004d9add9a..ee325c4353df94c5cd05313d7c784bcfb08b1f73 100644 --- a/IoTSharp/Extensions/MqttExtension.cs +++ b/IoTSharp/Extensions/MqttExtension.cs @@ -73,23 +73,23 @@ namespace IoTSharp var logger = _loggerFactory.CreateLogger(); mqttNetLogger.LogMessagePublished += (object sender, MqttNetLogMessagePublishedEventArgs e) => { - var message = $"ID:{e.TraceMessage.LogId},ThreadId:{e.TraceMessage.ThreadId},Source:{e.TraceMessage.Source},Timestamp:{e.TraceMessage.Timestamp},Message:{e.TraceMessage.Message}"; - switch (e.TraceMessage.Level) + var message = $"ID:{e.LogMessage.LogId},ThreadId:{e.LogMessage.ThreadId},Source:{e.LogMessage.Source},Timestamp:{e.LogMessage.Timestamp},Message:{e.LogMessage.Message}"; + switch (e.LogMessage.Level) { case MqttNetLogLevel.Verbose: - logger.LogTrace(e.TraceMessage.Exception, message); + logger.LogTrace(e.LogMessage.Exception, message); break; case MqttNetLogLevel.Info: - logger.LogInformation(e.TraceMessage.Exception, message); + logger.LogInformation(e.LogMessage.Exception, message); break; case MqttNetLogLevel.Warning: - logger.LogWarning(e.TraceMessage.Exception, message); + logger.LogWarning(e.LogMessage.Exception, message); break; case MqttNetLogLevel.Error: - logger.LogError(e.TraceMessage.Exception, message); + logger.LogError(e.LogMessage.Exception, message); break; default: diff --git a/IoTSharp/IoTSharp.csproj b/IoTSharp/IoTSharp.csproj index f340d3dff13263deb3686aa3247a4c75d96ad302..309f1ac8a837b6e726ff17eb3497d310e8eff46a 100644 --- a/IoTSharp/IoTSharp.csproj +++ b/IoTSharp/IoTSharp.csproj @@ -35,48 +35,48 @@ - - - - + + + + - + - + - - - - + + + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/IoTSharp/Startup.cs b/IoTSharp/Startup.cs index 9ee9d668b2742be21528143c74c715fd84368d1f..6019ef7cae448f9775a94f384e398bcdb2433332 100644 --- a/IoTSharp/Startup.cs +++ b/IoTSharp/Startup.cs @@ -36,7 +36,7 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; - +using MQTTnet.Server; namespace IoTSharp { public class Startup @@ -178,7 +178,6 @@ namespace IoTSharp { endpoints.MapControllers(); }); - app.UseSwaggerUi3(); app.UseOpenApi();