Merge pull request #64 from ChrisPulman/RetireNet7

Merge From Main
ChrisPulman · Aug 16, 2024 · c4211aa · c4211aa
2 parents 32c33b8 + e862567
commit c4211aa
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
     <Nullable>enable</Nullable>
     <PackageIcon>logo.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageReleaseNotes>Compatability with Net 6 / 7 / 8 and netstandard2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Compatability with Net 6 / 8 and netstandard2.0</PackageReleaseNotes>
     <PackageTags>MQTT;MQTTnet;S7Plc;Allen;Bradley;Rockwell;Modbus;S7;Seimens;Serial;Beckhoff;TwinCat;rx;reactive;extensions;observable;LINQ;net;netstandard</PackageTags>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
@@ -28,8 +28,7 @@
     <!-- Include PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <MQTTnetVersion>4.3.5.1141</MQTTnetVersion>
-    <MQTTnetRxTargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</MQTTnetRxTargetFrameworks>
+    <MQTTnetRxTargetFrameworks>netstandard2.0;net6.0;net8.0</MQTTnetRxTargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "2.0.1",
+    "version": "2.1.1",
     "publicReleaseRefSpec": [
         "^refs/heads/master$",
         "^refs/heads/main$"

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoWarn>$(NoWarn);CS0649;CS0169;CA1822;IDE1006</NoWarn>
     <IsPackable>false</IsPackable>
     <RootNamespace></RootNamespace>
@@ -12,13 +12,17 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Identity" Version="1.12.0" />
     <PackageReference Include="CP.Nuke.BuildTools" Version="1.0.44" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.141" />
+    <PackageReference Include="NuGet.Packaging" Version="6.11.0" />
     <PackageReference Include="Nuke.Common" Version="8.0.0" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageDownload Include="nbgv" Version="[3.6.133]" />
+    <PackageDownload Include="nbgv" Version="[3.6.141]" />
   </ItemGroup>
 
 </Project>
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="nuget.org" protocolVersion="3" value="https://api.nuget.org/v3/index.json" />
+        <add key="MyGet" value="https://www.myget.org/F/mqttnet/api/v3/index.json" />
+    </packageSources>
+</configuration>
diff --git a/src/MQTTnet.Rx.Client.TestApp/MQTTnet.Rx.Client.TestApp.csproj b/src/MQTTnet.Rx.Client.TestApp/MQTTnet.Rx.Client.TestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>

diff --git a/src/MQTTnet.Rx.Client/MQTTnet.Rx.Client.csproj b/src/MQTTnet.Rx.Client/MQTTnet.Rx.Client.csproj
@@ -6,8 +6,14 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <!--<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="5.0.0.1145" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net8.0'">
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.6.1152" />
+  </ItemGroup>-->
   <ItemGroup>
-    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="$(MQTTnetVersion)" />
+    <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.3.6.1152" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>

diff --git a/src/MQTTnet.Rx.TwinCAT/MQTTnet.Rx.TwinCAT.csproj b/src/MQTTnet.Rx.TwinCAT/MQTTnet.Rx.TwinCAT.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	  <TargetFrameworks>netstandard2.0;net6.0-windows10.0.17763;net7.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
+	  <TargetFrameworks>netstandard2.0;net6.0-windows10.0.17763;net8.0-windows10.0.17763</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/MQTTnet.Rx.sln b/src/MQTTnet.Rx.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34003.232
@@ -9,10 +8,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionConfig", "SolutionC
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
 		..\.gitignore = ..\.gitignore
+		..\Directory.Build.props = ..\Directory.Build.props
 		..\global.json = ..\global.json
 		..\LICENSE = ..\LICENSE
 		..\README.md = ..\README.md
 		..\stylecop.json = ..\stylecop.json
+		..\Version.json = ..\Version.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Rx.Client", "MQTTnet.Rx.Client\MQTTnet.Rx.Client.csproj", "{A0EB10D6-429B-4CB6-8F73-5992BF1BD577}"
@@ -29,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Rx.TwinCAT", "MQTTn
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "..\build\_build.csproj", "{1DC64497-CF38-416D-A023-C8012E5265A4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSingleClient", "TestSingleClient\TestSingleClient.csproj", "{1340E0BA-6642-4633-850E-E62F0C137DE8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestSingleClient", "TestSingleClient\TestSingleClient.csproj", "{1340E0BA-6642-4633-850E-E62F0C137DE8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/TestSingleClient/TestSingleClient.csproj b/src/TestSingleClient/TestSingleClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>