From 60a8aca2fc066ae2688b02cfcaddd71d7ef10eec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=9B=BD=E4=BC=9F?= <366193849@qq.com> Date: Tue, 3 Dec 2024 23:01:06 +0800 Subject: [PATCH 1/2] Add Directory.Build.props. --- Directory.Build.props | 46 +++++++++++++++++++ Samples/MQTTnet.Samples.csproj | 11 +---- .../MQTTnet.AspTestApp.csproj | 11 +---- .../MQTTnet.AspNetCore.csproj | 39 +--------------- .../MQTTnet.Benchmarks.csproj | 11 +---- .../MQTTnet.Extensions.Rpc.csproj | 32 ------------- .../MQTTnet.Extensions.TopicTemplate.csproj | 29 ------------ Source/MQTTnet.Server/MQTTnet.Server.csproj | 32 ------------- Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj | 10 +--- Source/MQTTnet.Tests/MQTTnet.Tests.csproj | 11 +---- Source/MQTTnet/MQTTnet.csproj | 39 +--------------- 11 files changed, 58 insertions(+), 213 deletions(-) create mode 100644 Directory.Build.props diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..25fc0cb7f --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,46 @@ + + + net8.0 + MQTTnet + The contributors of MQTTnet + The contributors of MQTTnet + Copyright (c) .NET Foundation and Contributors + + false + false + true + false + false + + en-US + 1591;NETSDK1138;NU1803;NU1901;NU1902 + + true + all + true + low + latest-Recommended + + MIT + https://github.com/dotnet/MQTTnet + https://github.com/dotnet/MQTTnet.git + git + + true + + + + + True + \ + + + True + \ + + + + + + + diff --git a/Samples/MQTTnet.Samples.csproj b/Samples/MQTTnet.Samples.csproj index 5fe84d380..c0016eb75 100644 --- a/Samples/MQTTnet.Samples.csproj +++ b/Samples/MQTTnet.Samples.csproj @@ -2,19 +2,12 @@ Exe - net8.0 enable enable false true - false - false - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended + false + false diff --git a/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj b/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj index 254069b60..7267b1692 100644 --- a/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj +++ b/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj @@ -1,19 +1,12 @@ - net8.0 enable enable false true - false - false - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended + false + false diff --git a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj index 5357dd702..8a4d1afec 100644 --- a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj +++ b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj @@ -1,60 +1,25 @@ - net8.0 MQTTnet.AspNetCore MQTTnet.AspNetCore True - The contributors of MQTTnet - MQTTnet MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. - The contributors of MQTTnet MQTTnet.AspNetCore - false - false true true snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false nuget.png true - true - MIT For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). - true - true true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - low - latest-Recommended - - - - True - \ - - - + - - - - - + diff --git a/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj b/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj index d5e1f11f9..a646b3ce6 100644 --- a/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj +++ b/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj @@ -1,20 +1,13 @@ - true Exe Full - net8.0 false - false - false true - 1591;NETSDK1138;NU1803;NU1901;NU1902;CS8892 + $(NoWarn);CS8892 + false false - all - true - low - latest-Recommended diff --git a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj index b38fb489d..913790c52 100644 --- a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj +++ b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj @@ -1,54 +1,22 @@ - net8.0 MQTTnet.Extensions.Rpc MQTTnet.Extensions.Rpc True - The contributors of MQTTnet - MQTTnet This is an extension library which allows executing synchronous device calls including a response using MQTTnet. - The contributors of MQTTnet MQTTnet.Extensions.Rpc - false - false true true snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false nuget.png true - true - MIT For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). true true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended - - - True - \ - - - - - - - diff --git a/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj b/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj index 5bfcfeb5c..3c46008a4 100644 --- a/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj +++ b/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj @@ -1,55 +1,26 @@ - net8.0 MQTTnet.Extensions.TopicTemplate MQTTnet.Extensions.TopicTemplate True - The contributors of MQTTnet - MQTTnet Provides mqtt topic templating logic to support dispatch, routing and similar functionality based on the well known moustache syntax (AsyncAPI compatible). README.md - The contributors of MQTTnet MQTTnet.Extensions.TopicTemplate - false - false true true snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry MQTTClient Messaging Routing AsyncAPI Template - en-US nuget.png true - true - MIT For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/). true 1591;NETSDK1138 - - - True - \ - - - True - \ - - - - - - - - diff --git a/Source/MQTTnet.Server/MQTTnet.Server.csproj b/Source/MQTTnet.Server/MQTTnet.Server.csproj index df4863607..b8bc402a3 100644 --- a/Source/MQTTnet.Server/MQTTnet.Server.csproj +++ b/Source/MQTTnet.Server/MQTTnet.Server.csproj @@ -1,57 +1,25 @@ - net8.0 MQTTnet.Server MQTTnet.Server True - The contributors of MQTTnet - MQTTnet true This is the server implementation of MQTTnet. - The contributors of MQTTnet MQTTnet.Server - false - false true true snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false nuget.png true - true - MIT true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low enable disable - latest-Recommended - - - True - \ - - - - - - - diff --git a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj index 374ded794..3bb3d65d1 100644 --- a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj +++ b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj @@ -3,17 +3,9 @@ Exe Full - net8.0 false - false - false true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended + false diff --git a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj index b29190740..5c0946201 100644 --- a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj +++ b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj @@ -1,17 +1,10 @@ - net8.0 false - false - false true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - all - true - low - latest-Recommended + false + false diff --git a/Source/MQTTnet/MQTTnet.csproj b/Source/MQTTnet/MQTTnet.csproj index ece6812a0..14cd2f5d3 100644 --- a/Source/MQTTnet/MQTTnet.csproj +++ b/Source/MQTTnet/MQTTnet.csproj @@ -10,59 +10,22 @@ - net8.0 MQTTnet MQTTnet True - The contributors of MQTTnet - MQTTnet true MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol. - The contributors of MQTTnet MQTTnet - false - false true true - snupkg - Copyright (c) .NET Foundation and Contributors - https://github.com/dotnet/MQTTnet - https://github.com/dotnet/MQTTnet.git - git + snupkg MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor - en-US - false - false nuget.png true - true - MIT true - 1591;NETSDK1138;NU1803;NU1901;NU1902 - true - true - all - true - low - latest-Recommended Full - - - - - - - True - \ - - - - - - - \ No newline at end of file From 91f65652298241464a3eed8cca4c4ed17b350b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=9B=BD=E4=BC=9F?= <366193849@qq.com> Date: Wed, 4 Dec 2024 22:32:58 +0800 Subject: [PATCH 2/2] Adjust Analysis related properties and add conditional enablement for ContinuousIntegrationBuild. --- Directory.Build.props | 11 +++++++++-- MQTTnet.sln | 5 ++--- Samples/MQTTnet.Samples.csproj | 1 - Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj | 1 - Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj | 1 - Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj | 1 - Source/MQTTnet.Tests/MQTTnet.Tests.csproj | 1 - 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 25fc0cb7f..77024096d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,19 +13,26 @@ false en-US + true 1591;NETSDK1138;NU1803;NU1901;NU1902 - true all true low - latest-Recommended MIT https://github.com/dotnet/MQTTnet https://github.com/dotnet/MQTTnet.git git + + latest + recommended + default + + + + true diff --git a/MQTTnet.sln b/MQTTnet.sln index 15a0d2323..2c1fcd710 100644 --- a/MQTTnet.sln +++ b/MQTTnet.sln @@ -7,11 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "Source\MQTTnet\M EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3F60ECB-45BA-4C66-8903-8BB89CA67998}" ProjectSection(SolutionItems) = preProject + .github\workflows\ci.yml = .github\workflows\ci.yml CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md + Directory.Build.props = Directory.Build.props LICENSE = LICENSE README.md = README.md Source\ReleaseNotes.md = Source\ReleaseNotes.md - .github\workflows\ci.yml = .github\workflows\ci.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore", "Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj", "{F10C4060-F7EE-4A83-919F-FF723E72F94A}" @@ -85,6 +86,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894} EndGlobalSection - GlobalSection(NestedProjects) = preSolution - EndGlobalSection EndGlobal diff --git a/Samples/MQTTnet.Samples.csproj b/Samples/MQTTnet.Samples.csproj index c0016eb75..4dec8655c 100644 --- a/Samples/MQTTnet.Samples.csproj +++ b/Samples/MQTTnet.Samples.csproj @@ -6,7 +6,6 @@ enable false true - false false diff --git a/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj b/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj index 7267b1692..04576c2a0 100644 --- a/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj +++ b/Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj @@ -5,7 +5,6 @@ enable false true - false false diff --git a/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj b/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj index a646b3ce6..59f9693ab 100644 --- a/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj +++ b/Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj @@ -6,7 +6,6 @@ false true $(NoWarn);CS8892 - false false diff --git a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj index 3bb3d65d1..4cef093fd 100644 --- a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj +++ b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj @@ -5,7 +5,6 @@ Full false true - false diff --git a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj index 5c0946201..bb9f8cb30 100644 --- a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj +++ b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj @@ -3,7 +3,6 @@ false true - false false